[MERGE] iter_changes-based merge

[Aaron Bentley]

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

Aaron Bentley wrote:

> This patch modifies merge so that it uses Tree._iter_changes.

Somehow, I managed to omit some of the changes from this patch.  Here's
a corrected one.

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

iD8DBQFGjpEq0F+nu1YWqI0RAg12AJ9H4TLrrLR5NVIpQ2HVm8oEcCb7PACfS2xl
mKpZtHvChurn3GBJiYLVfLw=
=UeBr
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: iter-changes-merge.patch
Type: text/x-patch
Size: 52071 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070706/ae9ecb86/attachment-0001.bin