Mercurial > emacs
view etc/.cvsignore @ 54903:922f49230ff5
(smerge-match-conflict): Try to do something sensible
for nested conflict markers.
(smerge-find-conflict): Better handle errors in smerge-match-conflict.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 15 Apr 2004 20:19:11 +0000 |
parents | 36d1258dea8e |
children | 63710e8dd0ef |