Function: edir-merge-revisions-with-ancestor
edir-merge-revisions-with-ancestor is a and interactive
for ediff-merge-directory-revisions-with-ancestor, defined in
ediff.el.gz.
Signature
(edir-merge-revisions-with-ancestor DIR1 REGEXP &optional MERGE-AUTOSTORE-DIR)
Documentation
Run Ediff on DIR1 and merge its files with their revisions and ancestors.
The second argument, REGEXP, is a regular expression that filters the file names. Only the files that are under revision control are taken into account. MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
Key Bindings