2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16a77bc3e21..0b4bbaa8fda 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 9363b00a094..d27c492f1f9 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -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)