tree-less merges

Aaron Bentley aaron.bentley at utoronto.ca
Wed Nov 28 16:16:56 GMT 2007


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

Here's a patch against your branch that implements iter_tree_children,
and ensures that basic conflict resolution works.

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

iD8DBQFHTZR30F+nu1YWqI0RAjQiAJwPV/VAt9w0aWVDAkBTb955GemqUgCfdicA
nUCrnUbugcSWj1o+X+yAw2U=
=FfZb
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: transform-preview-4.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20071128/60ed3e76/attachment-0001.diff 


More information about the bazaar mailing list