[ANN][PLUGIN] external merge

[Aaron Bentley]

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

Martin Pool wrote:
> Perhaps we could have this behaviour builtin as say 'bzr merge
> --interactive', or automatically turned on by a user preference?  It
> could also be called from say 'bzr remerge --interactive'.

It would certainly be possible to implement external merges as a new
merge type, or maybe a reprocessing step.  OTOH, with the API changing
radically, it may be better to implement them in cmd_merge and cmd_remerge.

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

iD8DBQFD+cz50F+nu1YWqI0RAqlLAJsE+x79T2q98P9ecJyso7ntn1A1+wCZAX2K
r/ckTJmwK/nC0vvP2EGTC5M=
=PKfZ
-----END PGP SIGNATURE-----