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)) |