Mercurial > emacs
diff update-subdirs @ 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 | 107ccd98fa12 |
children | 606f2d163a64 1a762a842f80 |