# HG changeset patch
# User Reiner Steib <Reiner.Steib@gmx.de>
# Date 1210537560 0
# Node ID f413ee341af089e6c90a5339630b1fb1c03b9bcb
# Parent  e2fb0c9c7a427f21aa8054f9f602e9dfa452800b
(smerge-start-session): Revert unintended change in revision 1.69.

diff -r e2fb0c9c7a42 -r f413ee341af0 lisp/smerge-mode.el
--- a/lisp/smerge-mode.el	Sun May 11 20:25:15 2008 +0000
+++ b/lisp/smerge-mode.el	Sun May 11 20:26:00 2008 +0000
@@ -1228,7 +1228,8 @@
 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)