(vc-bzr-after-dir-status): Detect the conflict state.

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f20270163964085d281cf5c4731169edb01f05a..e8603f406f8bc3d54512953bc90feec2d64af997 100644 (file)
--- 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):