[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/04/10 15:03:31

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.13413
retrieving revision 1.13414
diff -u -b -r1.13413 -r1.13414
--- ChangeLog   10 Apr 2008 11:07:37 -0000      1.13413
+++ ChangeLog   10 Apr 2008 15:03:27 -0000      1.13414
@@ -1,3 +1,7 @@
+2008-04-10  Dan Nicolaescu  <address@hidden>
+
+       * vc-bzr.el (vc-bzr-after-dir-status): Detect the conflict state.
+
 2008-04-10  Juanma Barranquero  <address@hidden>
 
        * subr.el (assoc-ignore-case, assoc-ignore-representation):