Mercurial > emacs

diff lisp/vc-svn.el @ 87785:8f1628da223f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* smerge-mode.el (smerge-start-session): Rename from smerge-auto. * pcvs.el (cvs-revert-if-needed): * vc.el (vc-maybe-resolve-conflicts): Rename callers. * vc-svn.el (vc-svn-find-file-hook): * vc-arch.el (vc-arch-find-file-hook): Undo previous change.
author Dan Nicolaescu <dann@ics.uci.edu>
date Wed, 16 Jan 2008 06:22:59 +0000
parents c2a952d12e21
children 800f4ac6c848
line wrap: on
line diff
--- a/lisp/vc-svn.el	Wed Jan 16 05:11:33 2008 +0000
+++ b/lisp/vc-svn.el	Wed Jan 16 06:22:59 2008 +0000
@@ -551,7 +551,7 @@
           (re-search-forward "^<<<<<<< " nil t))
         ;; There are conflict markers.
         (progn
-          (smerge-auto)
+          (smerge-start-session)
           (add-hook 'after-save-hook 'vc-svn-resolve-when-done nil t))
       ;; There are no conflict markers.  This is problematic: maybe it means
       ;; the conflict has been resolved and we should immediately call "svn