diff options
| author | Miles Bader <miles@gnu.org> | 2007-12-06 09:51:45 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-12-06 09:51:45 +0000 |
| commit | 0bd508417142ff377f34aec8dcec9438d9175c2c (patch) | |
| tree | 4d60fe09e5cebf7d79766b11e9cda8cc1c9dbb9b /lisp/smerge-mode.el | |
| parent | 98fe991da804a42f53f6a5e84cd5eab18a82e181 (diff) | |
| parent | 9fb1ba8090da3528de56158a79bd3527d31c7f2f (diff) | |
| download | emacs-0bd508417142ff377f34aec8dcec9438d9175c2c.tar.gz emacs-0bd508417142ff377f34aec8dcec9438d9175c2c.tar.bz2 emacs-0bd508417142ff377f34aec8dcec9438d9175c2c.zip | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 1 |
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) |