[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff.el
From: |
Pavel Janík |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff.el |
Date: |
Sun, 13 Jan 2002 04:55:21 -0500 |
Index: emacs/lisp/ediff.el
diff -c emacs/lisp/ediff.el:1.54 emacs/lisp/ediff.el:1.55
*** emacs/lisp/ediff.el:1.54 Mon Jan 7 23:36:00 2002
--- emacs/lisp/ediff.el Sun Jan 13 04:55:20 2002
***************
*** 1243,1249 ****
;; buffer
merge-buffer-file)
"Run Ediff by merging two revisions of a file with a common ancestor.
! The file is the the optional FILE argument or the file visited by the current
buffer."
(interactive)
(if (stringp file) (find-file file))
--- 1243,1249 ----
;; buffer
merge-buffer-file)
"Run Ediff by merging two revisions of a file with a common ancestor.
! The file is the optional FILE argument or the file visited by the current
buffer."
(interactive)
(if (stringp file) (find-file file))