Commit 8653eee8 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(smerge-start-session): Don't call smerge-next if

looking at conflict marker.
parent 6494957a
2008-05-05 Tom Tromey <tromey@redhat.com>
* smerge-mode.el (smerge-start-session): Don't call smerge-next if
looking at conflict marker.
2008-05-05 Stefan Monnier <monnier@iro.umontreal.ca>
 
* vc-dispatcher.el (vc-dir-mark-buffer-changed): Fix typo
......
......@@ -1227,7 +1227,8 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict."
If no conflict maker is found, turn off `smerge-mode'."
(smerge-mode 1)
(condition-case nil
(smerge-next)
(unless (looking-at smerge-begin-re)
(smerge-next))
(error (smerge-auto-leave))))
(provide 'smerge-mode)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment