From: Dave Love <fx@gnu.org>
Date: Wed, 17 Jan 2001 22:01:57 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.96~232
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cebd37ce8749339367948f45c81834031a9aa567;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 655cdf765ab..6901ec0b616 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2001-01-17  Dave Love  <fx@gnu.org>
 
+	* ediff-init.el (ediff-before-setup-hook)
+	(ediff-merge-filename-prefix): Add :version.
+
 	* international/latin1-disp.el: Require disp-table.
 	(latin1-display): Fix :set.