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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/31 01:49:59

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.13254
retrieving revision 1.13255
diff -u -b -r1.13254 -r1.13255
--- ChangeLog   31 Mar 2008 01:47:29 -0000      1.13254
+++ ChangeLog   31 Mar 2008 01:49:57 -0000      1.13255
@@ -1,3 +1,8 @@
+2008-03-31  Stefan Monnier  <address@hidden>
+
+       * smerge-mode.el (smerge-refine): Allow highlighting other subparts
+       in 3-way conflicts.
+
 2008-03-31  Glenn Morris  <address@hidden>
 
        * calendar/cal-bahai.el (calendar-bahai-date-string): Avoid an error for