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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/05/05 06:16:21

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.13662
retrieving revision 1.13663
diff -u -b -r1.13662 -r1.13663
--- ChangeLog   5 May 2008 06:12:31 -0000       1.13662
+++ ChangeLog   5 May 2008 06:16:18 -0000       1.13663
@@ -1,3 +1,8 @@
+2008-05-05  Tom Tromey  <address@hidden>
+
+       * smerge-mode.el (smerge-start-session): Don't call smerge-next if
+       looking at conflict marker.
+
 2008-05-05  Stefan Monnier  <address@hidden>
 
        * vc-dispatcher.el (vc-dir-mark-buffer-changed): Fix typo