- text merge O(e * e * f) + O(b)
a: | revisions missing from repo: |
---|---|
b: | nodes in the revision graph: |
c: | files that differ between base and other: |
d: | number of files in the tree |
e: | number of lines in the text |
f: | number number of files requiring text merge |
g: | number of conflicts (g <= c) |
h: | humber of uncommon ancestors |
i: | number of revisions between base and other |
Multiparent deltas may offer some nice properties for performance of annotation based merging.