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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/01/13 20:03:37

Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -b -r1.511 -r1.512
--- vc.el       10 Jan 2008 07:51:25 -0000      1.511
+++ vc.el       13 Jan 2008 20:03:34 -0000      1.512
@@ -2899,8 +2899,7 @@
        (if (not (vc-find-backend-function (vc-backend file) 'merge-news))
            (error "Sorry, merging news is not implemented for %s"
                   (vc-backend file))
-         (vc-call merge-news file)
-         (vc-resynch-buffer file t t))))))
+         (vc-maybe-resolve-conflicts file (vc-call merge-news file)))))))
 
 (defun vc-version-backup-file (file &optional rev)
   "Return name of backup file for revision REV of FILE.