From ba463d9eca5f05817eb843372ebc9e46ecbb471f Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 14 Jan 2008 07:38:05 +0000 Subject: * 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. --- lisp/pcvs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/pcvs.el') diff --git a/lisp/pcvs.el b/lisp/pcvs.el index c4a7f67d930..401962872a2 100644 --- 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-mode 1)))))))) + (smerge-auto)))))))) (defun cvs-change-cvsroot (newroot) -- cgit v1.2.1