[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/11/19 08:50:05

Index: smerge-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/smerge-mode.el,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- smerge-mode.el      8 Nov 2007 16:58:07 -0000       1.57
+++ smerge-mode.el      19 Nov 2007 08:50:02 -0000      1.58
@@ -905,6 +905,7 @@
 (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)