Files
emacs/lisp/pcvs-parse.el
Stefan Monnier e6a4ba7311 (cvs-parse-table): Look for conflict markers in the
file to resolve the ambiguity between C-conflict and C-need-merge.
2000-06-11 22:30:49 +00:00

18 KiB