tree-less merges

[Aaron Bentley]

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

Michael Hudson wrote:

> I'm not sure what
> TreeTransform.get_preview_tree would be useful for, besides testing
> though. Am I missing something?

I think it might be nice for GUI tools, so they can show the user what
will happen, and get confirmation.

Or you could add some new switches to merge:
 - abort if the merge would have conflicts
 - abort if the merge would do nothing

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

iD8DBQFHRvZl0F+nu1YWqI0RAkX5AJ9vOA56O+BXJkHh2lF8qgAPyHSUOgCbBNXj
57VxMrct7e9TL1l9PZF5y1Q=
=gLHX
-----END PGP SIGNATURE-----