aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog.6
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog.6')
-rw-r--r--lisp/ChangeLog.62
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.