Mercurial > emacs
comparison lisp/w32-fns.el @ 29565:a5845156564d
(cvs-parse-table): Look for conflict markers in the
file to resolve the ambiguity between C-conflict and C-need-merge.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sun, 11 Jun 2000 22:30:49 +0000 |
| parents | d1176f1c776e |
| children | c470ffbc2a4a |
comparison
equal
deleted
inserted
replaced
| 29564:ae1233eea722 | 29565:a5845156564d |
|---|