# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1080317853 0
# Node ID a9657efd4fc8708eab8700c772367f9f8571a200
# Parent  c3043c1faed39b1176f65132207c3a1e20a2936e
*** empty log message ***

diff -r c3043c1faed3 -r a9657efd4fc8 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Mar 26 16:17:12 2004 +0000
+++ b/lisp/ChangeLog	Fri Mar 26 16:17:33 2004 +0000
@@ -1,5 +1,7 @@
 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.