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