From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 26 Mar 2004 16:17:33 +0000 (+0000)
Subject: (vc-maybe-resolve-conflicts): Don't prompt the user.
X-Git-Tag: ttn-vms-21-2-B4~7076
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8dc87047d15a17c418495169707ca71439cea684;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5020ef0da4..61014b3103d 100644
--- 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 d55951eaff8..fdc2d13aa2d 100644
--- 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)