(vc-maybe-resolve-conflicts): Don't prompt the user.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5020ef0da4e97a1ed33eb4bd0582e527960f2b8..61014b3103d1a9e2bd80c9514b19bf290d1c4aaf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2004-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * vc.el (vc-maybe-resolve-conflicts): Don't prompt the user.
+
        * calc/calc.el (calc-mode-map): Use mapc.
 
        * apropos.el (apropos-mode): Don't autoload.

diff --git a/lisp/vc.el b/lisp/vc.el
index d55951eaff88d993ea682e2f1ea0f63a84d23808..fdc2d13aa2dcbfc8178a8c5af623e94d7fff170e 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 ;; Keywords: tools
 
-;; $Id: vc.el,v 1.371 2004/03/25 15:39:03 sds Exp $
+;; $Id: vc.el,v 1.372 2004/03/26 06:07:55 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -1989,9 +1989,7 @@ See Info node `Merging'."
   (vc-resynch-buffer file t (not (buffer-modified-p)))
   (if (zerop status) (message "Merge successful")
     (smerge-mode 1)
-    (if (y-or-n-p "Conflicts detected.  Resolve them now? ")
-       (vc-resolve-conflicts name-A name-B)
-      (message "File contains conflict markers"))))
+    (message "File contains conflicts.")))
 
 ;;;###autoload
 (defalias 'vc-resolve-conflicts 'smerge-ediff)