From e462b5b8a3d6933e9c260a53ddac74521f827225 Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Sun, 11 May 2008 20:26:00 +0000 Subject: [PATCH] (smerge-start-session): Revert unintended change in 2008-05-10T13:06:33Z!Reiner.Steib@gmx.de. --- lisp/smerge-mode.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 7efe1e6ff08..7175ec2c40d 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1228,7 +1228,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) -- 2.39.5