* smerge-mode.el (smerge-start-session): Rename from smerge-auto.

[bpt/emacs.git] / lisp / pcvs.el

diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 4019628..462597a 100644 (file)
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -2311,7 +2311,7 @@ this file, or a list of arguments to send to the program."
            ;; do want to reset the mode for VC, so we do it explicitly.
            (vc-find-file-hook)
            (when (eq (cvs-fileinfo->type fileinfo) 'CONFLICT)
-             (smerge-auto))))))))
+             (smerge-start-session))))))))
 
 \f
 (defun cvs-change-cvsroot (newroot)