summaryrefslogtreecommitdiff
path: root/lisp/smerge-mode.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/smerge-mode.el')
-rw-r--r--lisp/smerge-mode.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 18ca1a34181..dcbb97bd79c 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -905,6 +905,7 @@ replace chars to try and eliminate some spurious differences."
(defvar ediff-buffer-C)
(defvar ediff-ancestor-buffer)
(defvar ediff-quit-hook)
+(declare-function ediff-cleanup-mess "ediff-util" nil)
;;;###autoload
(defun smerge-ediff (&optional name-mine name-other name-base)