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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/01/16 06:23:01

Index: vc-arch.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-arch.el,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- vc-arch.el  14 Jan 2008 07:38:04 -0000      1.39
+++ vc-arch.el  16 Jan 2008 06:22:58 -0000      1.40
@@ -360,7 +360,7 @@
            (if (not (re-search-forward "^<<<<<<< " nil t))
                ;; The .rej file is obsolete.
                (condition-case nil (delete-file rej) (error nil))
-             (smerge-auto)
+             (smerge-mode 1)
              (add-hook 'after-save-hook
                        'vc-arch-delete-rej-if-obsolete nil t)
              (message "There are unresolved conflicts in this file")))