ediff-merge-revisions-with-ancestor
ediff-merge-revisions-with-ancestor is an interactive autoloaded compiled Lisp function in `ediff.el
'.
It is bound to <menu-bar> <tools> <ediff-merge> <ediff-merge-revisions-with-ancestor>.
(ediff-merge-revisions-with-ancestor &optional FILE STARTUP-HOOKS 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.