[Emacs-diffs] Changes to emacs/lisp/pcvs.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/01/16 06:23:01

Index: pcvs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/pcvs.el,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- pcvs.el     14 Jan 2008 07:38:04 -0000      1.117
+++ pcvs.el     16 Jan 2008 06:22:58 -0000      1.118
@@ -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-auto))))))))
+             (smerge-start-session))))))))
 
 
 (defun cvs-change-cvsroot (newroot)