/[emacs]/emacs/lisp/ediff.el
ViewVC logotype

Diff of /emacs/lisp/ediff.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.53 by kifer, Sat Jul 21 05:28:24 2001 UTC revision 1.53.4.1 by eliz, Thu May 16 16:00:18 2002 UTC
# Line 1193  buffer." Line 1193  buffer."
1193                                              ;; buffer                                              ;; buffer
1194                                              merge-buffer-file)                                              merge-buffer-file)
1195    "Run Ediff by merging two revisions of a file with a common ancestor.    "Run Ediff by merging two revisions of a file with a common ancestor.
1196  The file is the the optional FILE argument or the file visited by the current  The file is the optional FILE argument or the file visited by the current
1197  buffer."  buffer."
1198    (interactive)    (interactive)
1199    (if (stringp file) (find-file file))    (if (stringp file) (find-file file))

Legend:
Removed from v.1.53  
changed lines
  Added in v.1.53.4.1

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26