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 cf93ad12cd9..55000391777 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -247,7 +247,7 @@ Can be nil if the style is undecided, or else:
247 247
248(defun smerge-ensure-match (n) 248(defun smerge-ensure-match (n)
249 (unless (match-end n) 249 (unless (match-end n)
250 (error (format "No `%s'" (aref smerge-match-names n))))) 250 (error "No `%s'" (aref smerge-match-names n))))
251 251
252(defun smerge-auto-leave () 252(defun smerge-auto-leave ()
253 (when (and smerge-auto-leave 253 (when (and smerge-auto-leave