diff options
| author | Paul Eggert | 2012-04-21 17:53:32 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-21 17:53:32 -0700 |
| commit | bbd347f5f7e99da1a559dad818b5fa8f59c0901e (patch) | |
| tree | 77c1fc54c2240b08d2859109d18cac8812a8ffb1 /lisp/ChangeLog.6 | |
| parent | e4ecdc9c71af4199129d5dd2db1a32ff6b725fe4 (diff) | |
| parent | 9ee7d8b93cb143b473e6dffb708e777bc6fe5bd0 (diff) | |
| download | emacs-bbd347f5f7e99da1a559dad818b5fa8f59c0901e.tar.gz emacs-bbd347f5f7e99da1a559dad818b5fa8f59c0901e.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/ChangeLog.6')
| -rw-r--r-- | lisp/ChangeLog.6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index 85301ef78e1..5d79470bd2a 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 | |||
| @@ -715,7 +715,7 @@ | |||
| 715 | 715 | ||
| 716 | * ediff-diff.el (ediff-setup-fine-diff-regions): | 716 | * ediff-diff.el (ediff-setup-fine-diff-regions): |
| 717 | Allow diff options to be passed to the diff program. | 717 | Allow diff options to be passed to the diff program. |
| 718 | (ediff-make-diff2-buffer): Don't run Posix diff on remote files. | 718 | (ediff-make-diff2-buffer): Don't run POSIX diff on remote files. |
| 719 | (ediff-make-diff2-buffer): Refuses to diff remote files. | 719 | (ediff-make-diff2-buffer): Refuses to diff remote files. |
| 720 | (ediff-make-diff2-buffer, ediff-setup-diff-regions): Changed functions. | 720 | (ediff-make-diff2-buffer, ediff-setup-diff-regions): Changed functions. |
| 721 | (ediff-make-diff2-buffer): New function. | 721 | (ediff-make-diff2-buffer): New function. |