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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/04/11 01:10:45

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.13414
retrieving revision 1.13415
diff -u -b -r1.13414 -r1.13415
--- ChangeLog   10 Apr 2008 15:03:27 -0000      1.13414
+++ ChangeLog   11 Apr 2008 01:10:43 -0000      1.13415
@@ -1,3 +1,9 @@
+2008-04-11  Stefan Monnier  <address@hidden>
+
+       * smerge-mode.el (smerge-apply-resolution-patch): Fix typo.
+       (smerge-resolve): Merge the "2-way refinement" case with one half of
+       the "mere whitespace" resolution.
+
 2008-04-10  Dan Nicolaescu  <address@hidden>
 
        * vc-bzr.el (vc-bzr-after-dir-status): Detect the conflict state.