[MERGE] Implement Tree.plan_merge, deprecate RevisionTree.get_weave

[Aaron Bentley]

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

Robert Collins wrote:
> Can I suggest something like
> plan_file_merge ?

Oh, sure.  I'll do that before submitting.

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

iD8DBQFGnVyD0F+nu1YWqI0RAoptAJsHEWfvlGXRY1nH+g2YZ4v93kyyOQCfSZA5
s0Kj6LWBk3iSPll0/ARWHnY=
=FQbX
-----END PGP SIGNATURE-----