Mercurial > emacs
comparison etc/cs-refcard.tex @ 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 | 695cf19ef79e |
children | 23a17af379b1 375f2633d815 |
comparison
equal
deleted
inserted
replaced
54902:0895b563f562 | 54903:922f49230ff5 |
---|