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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/10/28 20:43:47

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14691
retrieving revision 1.14692
diff -u -b -r1.14691 -r1.14692
--- ChangeLog   28 Oct 2008 18:52:02 -0000      1.14691
+++ ChangeLog   28 Oct 2008 20:43:44 -0000      1.14692
@@ -1,3 +1,7 @@
+2008-10-28  Stefan Monnier  <address@hidden>
+
+       * smerge-mode.el: Require diff-mode at run-time as well.
+
 2008-10-28  Martin Rudalics  <address@hidden>
 
        * vc-cvs.el (vc-cvs-stay-local): Fix typo in choice.