X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/cbee283dd7dd655124e81a6bd555506476180b5d..21f7bc38bd59c9fd001da737808701ce3597e339:/lisp/ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f20270163..e8603f406f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):