Mercurial > emacs
diff lisp/ibuf-ext.el @ 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 | 922712402e72 |
children | ee5932bf781d |