*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 655cdf765abbbf12f4065eb7d2e6fd85551fa87c..6901ec0b616eb9be971e35f38e0d9295b4bd4d7f 100644 (file)
--- 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.