diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-01-14 07:38:05 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-01-14 07:38:05 +0000 |
| commit | ba463d9eca5f05817eb843372ebc9e46ecbb471f (patch) | |
| tree | bc0b28bf00715380c7a0ea0d59e1bcbc6a1e1e48 /lisp/vc-svn.el | |
| parent | 944df51178e5c6617e89d28a2e6797b02550fde0 (diff) | |
| download | emacs-ba463d9eca5f05817eb843372ebc9e46ecbb471f.tar.gz | |
* smerge-mode.el (smerge-auto): New function.
* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook):
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode.
(top-level): Add a Todo list.
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 e387b57d4fe..16e10edc202 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-mode 1) + (smerge-auto) (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 |