diff options
| author | André Spiegel <spiegel@gnu.org> | 1998-05-17 15:33:39 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 1998-05-17 15:33:39 +0000 |
| commit | edad8a097fefd0334e5d9776145dbe3852cf87f6 (patch) | |
| tree | 58919d6214b41d58db30867049794b692c78ef59 /lisp/emacs-lisp/lucid.el | |
| parent | a4370a7744b1b5c15b16795e8a22cb26a32eb8c3 (diff) | |
| download | emacs-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/lucid.el')
0 files changed, 0 insertions, 0 deletions