Better merge tool integration

[Gordon Tyler]

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

If anybody would like to see what progress I've made so far, check out
lp:~doxxx/bzr/mergetools

So far I have a basic implementation of the mergetools module and some
tests. My next step will probably be to add a bzr command to invoke a
mergetool so that you can use it without having to open up a python
interpreter. ;)

Ciao,
Gordon


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJMLg/bAAoJEIrPJfWinA2uifIIAIygXSYWh/rVOudJbBLpsOlt
MMJfraI1lYHD4vWHJyS52V0VsHo/zSiBatjOJu3HZv0JzC9ghd6zoJ2Auvp1rngi
mtK60RbtncCaecpzAwjWXVCZCPscZ1WdIoSTWkOZ5yLMGyhs0uSQeTLXtLZug5Ai
0c0b16GySQq5BsPQaDUFVs8WKY3s5JydS7+pTWFb9uLkYwO1IwCOltuSAtwaVfaW
TvBxCDbeblZ8LHQPAi4kILt10A+PXhdWSg6zzrUqA5QBkjLSQSYlYlinCJCR/DYB
cSYpXCzJQLy0Yu1W5TYmaBF2rilSqqFGicqt/7L3Vq3hV5j7zpV2P35BUjp2Njw=
=LJs5
-----END PGP SIGNATURE-----