Mercurial > emacs
changeset 54586:c3043c1faed3
(vc-maybe-resolve-conflicts): Don't prompt the user.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 26 Mar 2004 16:17:12 +0000 |
| parents | 1335f36a4a64 |
| children | a9657efd4fc8 |
| files | lisp/vc.el |
| diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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)