# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1194019121 0
# Node ID 42365a5d3510eb54463b42374b1098a2699f4d8c
# Parent  4ad9876159f2951cb58815cdc41819fcd664bf4d
*** empty log message ***

diff -r 4ad9876159f2 -r 42365a5d3510 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Nov 02 15:51:35 2007 +0000
+++ b/lisp/ChangeLog	Fri Nov 02 15:58:41 2007 +0000
@@ -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  <drake@begriffli.ch>  (tiny change)