]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f1c7754) | patch
(cvs-parse-table): Look for conflict markers in the
authorStefan Monnier <monnier@iro.umontreal.ca>
Sun, 11 Jun 2000 22:30:49 +0000 (22:30 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Sun, 11 Jun 2000 22:30:49 +0000 (22:30 +0000)
commite6a4ba731161f0386ea4a1e5dca7e2af3939fe4e
treea9a126b9190d8fae9ce287b0675cf23166689e49tree | snapshot
parentf1c7754a42cb5f65311060fa614f0f4962ed5ebfcommit | diff
(cvs-parse-table): Look for conflict markers in the
file to resolve the ambiguity between C-conflict and C-need-merge.
lisp/pcvs-parse.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.