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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/29 01:09:47

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.13233
retrieving revision 1.13234
diff -u -b -r1.13233 -r1.13234
--- ChangeLog   29 Mar 2008 00:43:56 -0000      1.13233
+++ ChangeLog   29 Mar 2008 01:09:45 -0000      1.13234
@@ -1,3 +1,8 @@
+2008-03-29  Stefan Monnier  <address@hidden>
+
+       * vc-bzr.el (vc-bzr-state-heuristic): Fix last change for when there
+       are conflicts.
+
 2008-03-29  Dan Nicolaescu  <address@hidden>
 
        * vc.el (vc-update): Check if the buffer is unsaved only if it