edir-merge-revisions-with-ancestor

edir-merge-revisions-with-ancestor is an alias for `ediff-merge-directory-revisions-with-ancestor' in `ediff.el'.


(edir-merge-revisions-with-ancestor DIR1 REGEXP &optional MERGE-AUTOSTORE-DIR)

Run Ediff on a directory, DIR1, merging 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.