summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/lmenu.el
diff options
context:
space:
mode:
authorAndré Spiegel <spiegel@gnu.org>1998-05-17 15:33:39 +0000
committerAndré Spiegel <spiegel@gnu.org>1998-05-17 15:33:39 +0000
commitedad8a097fefd0334e5d9776145dbe3852cf87f6 (patch)
tree58919d6214b41d58db30867049794b692c78ef59 /lisp/emacs-lisp/lmenu.el
parenta4370a7744b1b5c15b16795e8a22cb26a32eb8c3 (diff)
downloademacs-edad8a097fefd0334e5d9776145dbe3852cf87f6.tar.gz
emacs-edad8a097fefd0334e5d9776145dbe3852cf87f6.tar.bz2
emacs-edad8a097fefd0334e5d9776145dbe3852cf87f6.zip
(vc-parse-cvs-status): Grok new form of conflict message.
Diffstat (limited to 'lisp/emacs-lisp/lmenu.el')
0 files changed, 0 insertions, 0 deletions