aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/smerge-mode.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 4b677edc36a..31c7c4f2f12 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -372,7 +372,7 @@ This relies on mode-specific knowledge and thus only works in
372some major modes. Uses `smerge-resolve-function' to do the actual work." 372some major modes. Uses `smerge-resolve-function' to do the actual work."
373 (interactive) 373 (interactive)
374 (smerge-match-conflict) 374 (smerge-match-conflict)
375 (smerge-remove-props) 375 (smerge-remove-props (match-beginning 0) (match-end 0))
376 (cond 376 (cond
377 ;; Trivial diff3 -A non-conflicts. 377 ;; Trivial diff3 -A non-conflicts.
378 ((and (eq (match-end 1) (match-end 3)) 378 ((and (eq (match-end 1) (match-end 3))