[MERGE] LCA Merge resolution for tree-shape

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley wrote:
> Martin Pool wrote:
>> So is this active for the tree shape for all merge algorithms, or only --lca?
> 
> This is active for all of them.  (Technically, all that subclass
> Merge3Merger, but all of them subclass Merge3Merger).
> 
> Aaron

It is the active path logic when you detect a criss-cross in the revision
graph. As Aaron mentioned, *if* they subclass from Merge3Merger, but all do.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIvpR3JdeBCYSNAAMRAh3oAKDZWwXYS1W6rmmne0uioKpQZmh2XwCfbCG1
x3hKDnq4ZKcJ/i53OraClt0=
=EtzX
-----END PGP SIGNATURE-----