*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f0985a3a716c17755fd53b44b426bd7f1ac3ee5..707bc59589b46ecc3ee72adeba66aa02649c41d7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-14  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * smerge-mode.el (smerge-match-conflict): Fix typo.
+       (smerge-diff): Be careful to read match-data early enough.
+
 2001-11-14  Andre Spiegel  <spiegel@gnu.org>
 
        * vc.el (vc-diff-internal, vc-coding-system-for-diff)