diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-04-15 20:19:11 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-04-15 20:19:11 +0000 |
| commit | 9f0c286d22c49f88af21e00532e2fd232f748c99 (patch) | |
| tree | d82f12fdbad25df261830cba35922fd4a9eb5ba8 /lisp/emacs-lisp/edebug.el | |
| parent | adbb5567a81761c6625031c743e812cda1cdc8b6 (diff) | |
| download | emacs-9f0c286d22c49f88af21e00532e2fd232f748c99.tar.gz emacs-9f0c286d22c49f88af21e00532e2fd232f748c99.tar.bz2 emacs-9f0c286d22c49f88af21e00532e2fd232f748c99.zip | |
(smerge-match-conflict): Try to do something sensible
for nested conflict markers.
(smerge-find-conflict): Better handle errors in smerge-match-conflict.
Diffstat (limited to 'lisp/emacs-lisp/edebug.el')
0 files changed, 0 insertions, 0 deletions