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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/07/20 20:41:59

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11409
retrieving revision 1.11410
diff -u -b -r1.11409 -r1.11410
--- ChangeLog   20 Jul 2007 20:31:29 -0000      1.11409
+++ ChangeLog   20 Jul 2007 20:41:58 -0000      1.11410
@@ -1,3 +1,8 @@
+2007-07-20  Stefan Monnier  <address@hidden>
+
+       * add-log.el (change-log-resolve-conflict): Don't lose data if the
+       merge fails.
+
 2007-07-20  Dan Nicolaescu  <address@hidden>
 
        * progmodes/compile.el (compilation-auto-jump-to-first-error):