/[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.54 by kifer, Tue Jan 8 04:36:00 2002 UTC revision 1.55 by pj, Sun Jan 13 09:55:20 2002 UTC
# Line 1243  buffer." Line 1243  buffer."
1243                                              ;; buffer                                              ;; buffer
1244                                              merge-buffer-file)                                              merge-buffer-file)
1245    "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.
1246  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
1247  buffer."  buffer."
1248    (interactive)    (interactive)
1249    (if (stringp file) (find-file file))    (if (stringp file) (find-file file))

Legend:
Removed from v.1.54  
changed lines
  Added in v.1.55

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