Commit 8dc87047 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

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

parent e1fbd956
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.
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment