Mercurial > emacs

diff lisp/ChangeLog @ 93976:c53b75d15c27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-bzr-after-dir-status): Detect the conflict state.
author Dan Nicolaescu <dann@ics.uci.edu>
date Thu, 10 Apr 2008 15:03:27 +0000
parents 5d1c1d3e8c97
children 955774916817
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Apr 10 14:10:46 2008 +0000
+++ b/lisp/ChangeLog	Thu Apr 10 15:03:27 2008 +0000
@@ -1,3 +1,7 @@
+2008-04-10  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc-bzr.el (vc-bzr-after-dir-status): Detect the conflict state.
+
 2008-04-10  Juanma Barranquero  <lekktu@gmail.com>
 
 	* subr.el (assoc-ignore-case, assoc-ignore-representation):