-
Committer:
John Arbash Meinel
-
Date:
2009-12-04 01:56:26 UTC
-
mto:
This revision was merged to the branch mainline in
revision
4889.
-
Revision ID:
john@arbash-meinel.com-20091204015626-s3igiwbj5qiirwoa
Add the criss-cross flip-flop 'bug' for weave merge.
This is the reason lca merge was created. However, also show where lca
merge fails when there is a more complex ancestry. Since it thinks that
a missing line is a source of flip-flop errors, when really it is just
a different ancestry.