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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/02/07 23:02:13

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10661
retrieving revision 1.10662
diff -u -b -r1.10661 -r1.10662
--- ChangeLog   7 Feb 2007 21:56:29 -0000       1.10661
+++ ChangeLog   7 Feb 2007 23:02:12 -0000       1.10662
@@ -1,3 +1,9 @@
+2007-02-07  Stefan Monnier  <address@hidden>
+
+       * vc-svn.el (vc-svn-merge-news): Understand the new format with two
+       added columns of chars.  Remove support for the "no-meta-info" format.
+       Prompted by Romain Francoise <address@hidden>.
+
 2007-02-07  Nick Roberts  <address@hidden>
 
        * progmodes/gdb-ui.el (gdb-if-arrow): New macro.