diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-06-11 22:30:49 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-06-11 22:30:49 +0000 |
| commit | e6a4ba731161f0386ea4a1e5dca7e2af3939fe4e (patch) | |
| tree | a9a126b9190d8fae9ce287b0675cf23166689e49 /lisp/emacs-lisp | |
| parent | f1c7754a42cb5f65311060fa614f0f4962ed5ebf (diff) | |
| download | emacs-e6a4ba731161f0386ea4a1e5dca7e2af3939fe4e.tar.gz emacs-e6a4ba731161f0386ea4a1e5dca7e2af3939fe4e.tar.bz2 emacs-e6a4ba731161f0386ea4a1e5dca7e2af3939fe4e.zip | |
(cvs-parse-table): Look for conflict markers in the
file to resolve the ambiguity between C-conflict and C-need-merge.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions