*** /home/steve/cvsroot/emacs/lisp/smerge-mode.el.~1.74.~	2008-11-04 21:09:18.000000000 +0100
--- /home/steve/cvsroot/emacs/lisp/smerge-mode.el	2008-12-12 15:03:30.000000000 +0100
***************
*** 1076,1082 ****
  (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)
--- 1076,1082 ----
  (defvar ediff-buffer-C)
  (defvar ediff-ancestor-buffer)
  (defvar ediff-quit-hook)
! (declare-function ediff-cleanup-mess "ediff-util")
  
  ;;;###autoload
  (defun smerge-ediff (&optional name-mine name-other name-base)