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

8dc87047 · Stefan Monnier · e1fbd956 · 8dc87047 · 8dc87047
Commit 8dc87047 authored Mar 26, 2004 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

lisp/ChangeLog lisp/ChangeLog +2 -0

lisp/vc.el lisp/vc.el +2 -4

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
 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.

--- 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)