# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1222307050 0
# Node ID c82c45a5263a427cccfc0ccb519a496fb933a367
# Parent  2bdc0be612156db3ce7e89f3120312181207ae9c
* vc.el (vc-mark-resolved): Move message here from vc-default-mark-resolved.
(vc-default-mark-resolved): Change to an alias for ignore.

diff -r 2bdc0be61215 -r c82c45a5263a lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Sep 25 00:11:36 2008 +0000
+++ b/lisp/ChangeLog	Thu Sep 25 01:44:10 2008 +0000
@@ -1,3 +1,9 @@
+2008-09-25  Chong Yidong  <cyd@stupidchicken.com>
+
+	* vc.el (vc-mark-resolved): Move message here from
+	vc-default-mark-resolved.
+	(vc-default-mark-resolved): Change to an alias for ignore.
+
 2008-09-24  Andreas Politz  <politza@fh-trier.de>  (tiny change)
 
 	* term.el (term-emulate-terminal): Encode input string before