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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/31 02:57:41

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.13256
retrieving revision 1.13257
diff -u -b -r1.13256 -r1.13257
--- ChangeLog   31 Mar 2008 01:59:33 -0000      1.13256
+++ ChangeLog   31 Mar 2008 02:57:39 -0000      1.13257
@@ -1,5 +1,8 @@
 2008-03-31  Stefan Monnier  <address@hidden>
 
+       * smerge-mode.el (smerge-apply-resolution-patch): New fun.
+       (smerge-resolve): Add various resolution heuristics.
+
        * smerge-mode.el (smerge-refine): Allow highlighting other subparts
        in 3-way conflicts.