[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc.el,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc.el,v |
Date: |
Wed, 16 Jan 2008 06:23:02 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/01/16 06:23:01
Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -b -r1.513 -r1.514
--- vc.el 14 Jan 2008 07:38:03 -0000 1.513
+++ vc.el 16 Jan 2008 06:22:57 -0000 1.514
@@ -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
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Eric S. Raymond, 2008/01/01
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Stefan Monnier, 2008/01/05
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Juanma Barranquero, 2008/01/05
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/01/06
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Stefan Monnier, 2008/01/06
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/01/09
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/01/09
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/01/10
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/01/13
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/01/14
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v,
Dan Nicolaescu <=
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/01/18
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/01/18
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Glenn Morris, 2008/01/22
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/01/23
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/01/24
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Michael Albinus, 2008/01/26
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/01/27