diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-01-16 06:22:59 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-01-16 06:22:59 +0000 |
| commit | 28e4e2b434e3574f01b69c585dcccaecde6c940f (patch) | |
| tree | d53753a8d53617c9b9221d8f7bca31d78fdff120 /lisp/vc-svn.el | |
| parent | 8772b5a8566ddab4aea41c6bd24d4498f56f793b (diff) | |
| download | emacs-28e4e2b434e3574f01b69c585dcccaecde6c940f.tar.gz | |
* 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.
Diffstat (limited to 'lisp/vc-svn.el')
| -rw-r--r-- | lisp/vc-svn.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 16e10edc202..e463e138490 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -551,7 +551,7 @@ and that it passes `vc-svn-global-switches' to it before FLAGS." (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 |