From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 15 Nov 2001 01:31:52 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-21.2~317
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=29dd97aecda40f1911ad220ff2acba3cd19f653a;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f0985a3a71..707bc59589b 100644
--- 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)