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/pcvs.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/pcvs.el')
| -rw-r--r-- | lisp/pcvs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/pcvs.el b/lisp/pcvs.el index c4a7f67d930..401962872a2 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el @@ -2311,7 +2311,7 @@ this file, or a list of arguments to send to the program." ;; do want to reset the mode for VC, so we do it explicitly. (vc-find-file-hook) (when (eq (cvs-fileinfo->type fileinfo) 'CONFLICT) - (smerge-mode 1)))))))) + (smerge-auto)))))))) (defun cvs-change-cvsroot (newroot) |