Merge from emacs-24 branch

[gnu-emacs] / lisp / ChangeLog.6

diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 85301ef78e1a8941a2b46e95c0836ace0e2d8b1c..5d79470bd2a70e492200396c60c81e8754d83ee1 100644 (file)
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -715,7 +715,7 @@
 
        * ediff-diff.el (ediff-setup-fine-diff-regions):
        Allow diff options to be passed to the diff program.
-       (ediff-make-diff2-buffer): Don't run Posix diff on remote files.
+       (ediff-make-diff2-buffer): Don't run POSIX diff on remote files.
        (ediff-make-diff2-buffer): Refuses to diff remote files.
        (ediff-make-diff2-buffer, ediff-setup-diff-regions): Changed functions.
        (ediff-make-diff2-buffer): New function.