diff options
| author | Juanma Barranquero | 2007-11-02 16:01:20 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-11-02 16:01:20 +0000 |
| commit | cfe80861d875ba3e7b4424df59b72dde0be9360b (patch) | |
| tree | e5af2e0af2b021fce41d34eeab758f11b83a085a /lisp | |
| parent | d779c51027ba8d89d79993e7566e4e522f535407 (diff) | |
| download | emacs-cfe80861d875ba3e7b4424df59b72dde0be9360b.tar.gz emacs-cfe80861d875ba3e7b4424df59b72dde0be9360b.zip | |
*** empty log message ***
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 42201dd0af8..28630124723 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -19,12 +19,11 @@ | |||
| 19 | (ediff-reset-diff-options): Remove to simplify the mandatory option | 19 | (ediff-reset-diff-options): Remove to simplify the mandatory option |
| 20 | handling on Windows. | 20 | handling on Windows. |
| 21 | (ediff-set-diff-options): Add. | 21 | (ediff-set-diff-options): Add. |
| 22 | (ediff-diff-options): Changed. | 22 | (ediff-diff-options): Set "--binary" option as default in some cases. |
| 23 | 23 | ||
| 24 | * ediff-vers.el (ediff-vc-internal): Use ediff-vc-revision-other-window. | 24 | * ediff-vers.el (ediff-vc-internal): Use ediff-vc-revision-other-window. |
| 25 | (ediff-vc-merge-internal): use ediff-vc-revision-other-window and | 25 | (ediff-vc-merge-internal): Use ediff-vc-revision-other-window and |
| 26 | ediff-vc-working-revision. | 26 | ediff-vc-working-revision. Require vc-hooks. |
| 27 | Require vc-hooks. | ||
| 28 | 27 | ||
| 29 | 2007-11-02 Drake Wilson <drake@begriffli.ch> (tiny change) | 28 | 2007-11-02 Drake Wilson <drake@begriffli.ch> (tiny change) |
| 30 | 29 | ||