[MERGE] Cherrypick support for annotate merge
Aaron Bentley
aaron.bentley at utoronto.ca
Wed Dec 12 14:30:40 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Aaron Bentley wrote:
> This patch adds support for cherrypicks to annotate merge. For me, this
> is enough to make annotate merge a plausible default merge algorithm.
Could someone review this, please? Perhaps Martin?
http://bundlebuggy.aaronbentley.com/request/%3C475C8399.3040201%40utoronto.ca%3E
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHX/CQ0F+nu1YWqI0RAr9nAJwK6wEzwOWhWumagcJ0XLhv63b87wCfYSiY
5IjSWh5BS2zAOAGy7yt2zGs=
=OWMo
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list