Mercurial > emacs
diff lisp/ediff-diff.el @ 15482:b394c4c8b299
*** empty log message ***
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Sat, 22 Jun 1996 03:20:38 +0000 |
| parents | 43a3308fcf61 |
| children | b2fae8abc5b0 |
line wrap: on
line diff
--- a/lisp/ediff-diff.el Sat Jun 22 02:14:01 1996 +0000 +++ b/lisp/ediff-diff.el Sat Jun 22 03:20:38 1996 +0000 @@ -137,9 +137,8 @@ (ediff-extract-diffs ediff-diff-buffer ediff-word-mode ediff-narrow-bounds))) -;; fill in DIFF-BUFFER with the output from the diff program run on FILE1 and -;; FILE2 -;; Return the length of that buffer. +;; Run the diff program on FILE1 and FILE2 and put the output in DIFF-BUFFER +;; Return the size of DIFF-BUFFER (defun ediff-make-diff2-buffer (diff-buffer file1 file2) (cond ((< (ediff-file-size file1) 0) (message "Can't diff remote files: %s"
