Mercurial > emacs
changeset 85903:42365a5d3510
*** empty log message ***
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Fri, 02 Nov 2007 15:58:41 +0000 |
| parents | 4ad9876159f2 |
| children | 09ca3d882222 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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)