[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/pcvs.el,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/pcvs.el,v |
Date: |
Mon, 14 Jan 2008 07:38:08 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/01/14 07:38:06
Index: pcvs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/pcvs.el,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- pcvs.el 8 Jan 2008 20:44:53 -0000 1.116
+++ pcvs.el 14 Jan 2008 07:38:04 -0000 1.117
@@ -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)