[MERGE] Enable merging into PreviewTree

[Aaron Bentley]

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

Hi all,

This is the last of my PreviewTree threads.  It enables merging into a
PreviewTree-- that is, PreviewTree can now be the input to a merge.

This allows us to simulate the results of multiple merges.  For example,
given a branch A that is a prerequisite to merging branch B, we can now
predict what changes would result from merging B, if A had been merged
first.

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

iD8DBQFI2yqQ0F+nu1YWqI0RAqEGAJ90DgBlK/MHlVz7eM3EvExg0L1qnACdET8S
4Uxc3MUNcJ0CjlfR4egXdTY=
=tXI8
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-into-3430.patch
Type: text/x-diff
Size: 19787 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080925/7dc57203/attachment.bin