ediff-merge
ediff-merge is an alias for `ediff-merge-files' in `ediff.el
'.
(ediff-merge FILE-A FILE-B &optional STARTUP-HOOKS MERGE-BUFFER-FILE)
Merge two files without ancestor.
ediff.el
'.
(ediff-merge FILE-A FILE-B &optional STARTUP-HOOKS MERGE-BUFFER-FILE)
Merge two files without ancestor.