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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/01/15 21:40:11

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12577
retrieving revision 1.12578
diff -u -b -r1.12577 -r1.12578
--- ChangeLog   15 Jan 2008 15:03:36 -0000      1.12577
+++ ChangeLog   15 Jan 2008 21:40:09 -0000      1.12578
@@ -1,3 +1,8 @@
+2008-01-15  Stefan Monnier  <address@hidden>
+
+       * smerge-mode.el (smerge-refine): Also work on "same change conflicts".
+       (smerge-makeup-conflict): New command.
+
 2008-01-15  Thien-Thi Nguyen  <address@hidden>
 
        * log-edit.el (log-edit): Doc fix.