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

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

diff --git a/lisp/vc.el b/lisp/vc.el
index cc2627b..ac83365 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2245,7 +2245,7 @@ See Info node `Merging'."
 (defun vc-maybe-resolve-conflicts (file status &optional name-A name-B)
   (vc-resynch-buffer file t (not (buffer-modified-p)))
   (if (zerop status) (message "Merge successful")
-    (smerge-auto)
+    (smerge-mode 1)
     (message "File contains conflicts.")))
 
 ;;;###autoload