Function: ediff-merge
ediff-merge is a function alias and interactive for ediff-merge-files,
defined in ediff.el.gz.
Signature
(ediff-merge FILE-A FILE-B &optional STARTUP-HOOKS MERGE-BUFFER-FILE)
Documentation
Merge two files without ancestor.
FILE-A and FILE-B are the names of the files to be merged. STARTUP-HOOKS is a list of functions that Emacs calls without arguments after setting up the Ediff buffers. MERGE-BUFFER-FILE is the name of the file to be associated with the merge buffer..
Key Bindings