diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-03-26 16:17:33 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-03-26 16:17:33 +0000 |
| commit | 8dc87047d15a17c418495169707ca71439cea684 (patch) | |
| tree | b8b1b6858190883c5f4657dbf6a7a0008e85f802 /lisp/vc.el | |
| parent | e1fbd956b0d9e4c91ef72fb7d9f18018c2719677 (diff) | |
| download | emacs-8dc87047d15a17c418495169707ca71439cea684.tar.gz | |
(vc-maybe-resolve-conflicts): Don't prompt the user.
Diffstat (limited to 'lisp/vc.el')
| -rw-r--r-- | lisp/vc.el | 6 |
1 files changed, 2 insertions, 4 deletions
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) |