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

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      07/11/02 15:58:43

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12144
retrieving revision 1.12145
diff -u -b -r1.12144 -r1.12145
--- ChangeLog   2 Nov 2007 15:51:35 -0000       1.12144
+++ ChangeLog   2 Nov 2007 15:58:41 -0000       1.12145
@@ -19,12 +19,11 @@
        (ediff-reset-diff-options): Remove to simplify the mandatory option
        handling on Windows.
        (ediff-set-diff-options): Add.
-       (ediff-diff-options): Changed.
+       (ediff-diff-options): Set "--binary" option as default in some cases.
 
        * ediff-vers.el (ediff-vc-internal): Use ediff-vc-revision-other-window.
-       (ediff-vc-merge-internal): use ediff-vc-revision-other-window and
-       ediff-vc-working-revision.
-       Require vc-hooks.
+       (ediff-vc-merge-internal): Use ediff-vc-revision-other-window and
+       ediff-vc-working-revision.  Require vc-hooks.
 
 2007-11-02  Drake Wilson  <address@hidden>  (tiny change)