Mercurial > emacs
comparison src/bitmaps/dimple3.xbm @ 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 | 8f14d08e19f7 |
| children |
comparison
equal
deleted
inserted
replaced
| 54902:0895b563f562 | 54903:922f49230ff5 |
|---|