Mercurial > emacs

diff lisp/pcvs.el @ 87743:c2a952d12e21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* smerge-mode.el (smerge-auto): New function. * vc-svn.el (vc-svn-find-file-hook): * vc-arch.el (vc-arch-find-file-hook): * pcvs.el (cvs-revert-if-needed): * vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode. (top-level): Add a Todo list.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 14 Jan 2008 07:38:05 +0000
parents 107ccd98fa12
children 8f1628da223f
line wrap: on
line diff
--- a/lisp/pcvs.el	Sun Jan 13 22:10:51 2008 +0000
+++ b/lisp/pcvs.el	Mon Jan 14 07:38:05 2008 +0000
@@ -2311,7 +2311,7 @@
 	    ;; 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-mode 1))))))))
+	      (smerge-auto))))))))
 
 
 (defun cvs-change-cvsroot (newroot)