[MERGE] LCA Merge resolution for tree-shape

Aaron Bentley aaron at aaronbentley.com
Wed Sep 3 12:39:21 BST 2008


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

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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIvndo0F+nu1YWqI0RAi7tAJ47HldjT/AJVWvxhLpMik03xTTrEgCeOQRT
okZKhjuiOfqJZ81J5K6Rgok=
=cGNI
-----END PGP SIGNATURE-----



More information about the bazaar mailing list