# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1080317832 0
# Node ID c3043c1faed39b1176f65132207c3a1e20a2936e
# Parent  1335f36a4a64ecc4403d496f0f00b03dd44709f7
(vc-maybe-resolve-conflicts): Don't prompt the user.

diff -r 1335f36a4a64 -r c3043c1faed3 lisp/vc.el
--- a/lisp/vc.el	Fri Mar 26 15:30:42 2004 +0000
+++ b/lisp/vc.el	Fri Mar 26 16:17:12 2004 +0000
@@ -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 @@
   (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)