Mercurial > emacs
diff oldXMenu/Recomp.c @ 94626:5eb3ee73ed4e
(smerge-start-session): Don't call smerge-next if
looking at conflict marker.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 05 May 2008 06:16:20 +0000 |
parents | fec5e03aaf59 |
children | edf631bdbb7a ec58e5c426ef 5cc91198ffb2 |