]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: adbb556) | patch
(smerge-match-conflict): Try to do something sensible
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 15 Apr 2004 20:19:11 +0000 (20:19 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 15 Apr 2004 20:19:11 +0000 (20:19 +0000)
commit9f0c286d22c49f88af21e00532e2fd232f748c99
treed82f12fdbad25df261830cba35922fd4a9eb5ba8tree | snapshot
parentadbb5567a81761c6625031c743e812cda1cdc8b6commit | diff
(smerge-match-conflict): Try to do something sensible
for nested conflict markers.
(smerge-find-conflict): Better handle errors in smerge-match-conflict.
lisp/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.