diff options
| author | Stefan Monnier <[email protected]> | 2008-05-05 06:16:20 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2008-05-05 06:16:20 +0000 |
| commit | 8653eee82efbe2b3b14f671f3f991c356c2a5065 (patch) | |
| tree | 2bb58e500e780ac9ced113d90818282b903e9162 /lisp/smerge-mode.el | |
| parent | 6494957aaac593338de005e914c9eed4faded1c1 (diff) | |
(smerge-start-session): Don't call smerge-next if
looking at conflict marker.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 9363b00a09..d27c492f1f 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) |