Mercurial > emacs
diff lisp/vc.el @ 87785:8f1628da223f
* smerge-mode.el (smerge-start-session): Rename from smerge-auto.
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Rename callers.
* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook): Undo previous change.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Wed, 16 Jan 2008 06:22:59 +0000 |
parents | c2a952d12e21 |
children | 06bebff4deab |
line wrap: on
line diff
--- a/lisp/vc.el Wed Jan 16 05:11:33 2008 +0000 +++ b/lisp/vc.el Wed Jan 16 06:22:59 2008 +0000 @@ -2245,7 +2245,7 @@ (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