From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 25 Sep 2008 01:44:10 +0000 (+0000)
Subject: * vc.el (vc-mark-resolved): Move message here from vc-default-mark-resolved.
X-Git-Tag: emacs-pretest-23.0.90~2774
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=51dde7dc8a96079be86f92ed1d2f18f562d49b41;p=emacs.git

* vc.el (vc-mark-resolved): Move message here from vc-default-mark-resolved.
(vc-default-mark-resolved): Change to an alias for ignore.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4abcf07dcd8..a9159efe5e1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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