External merge tool support

[Gordon Tyler]

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

Hi all,

Maritza prompted me to pay some attention to this again (lots of things
vying for my attention lately) and I finished up my changes to the
qconflicts window to make it work better with the merge tools support
that I added to bzr.

The qconflicts window now has a dropdown list (aka combobox) that lets
the user select which merge tool to use, of the tools that they have
configured in qconfig. The configured default merge tool is
automatically selected when qconflicts is launched. Currently, if there
is a problem with the selected merge tool, the error message is set as
the tooltip on the disabled Launch button but I don't think that's quite
the right place for it since it's not very discoverable.

I'm also considering making the combobox editable so that the user could
type in their own merge tool commandline to temporarily use for this
conflict resolving session.

You can try this out by using bzr from lp:~doxxx/bzr/mergetools and the
qbzr plugin from lp:~doxxx/qbzr/mergetools. Once you have those setup,
run bzr qconfig and click the Detect button to find the merge tools we
recognize in the PATH.

All comments/suggestions/criticism are welcome.

Ciao,
Gordon

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

iQEcBAEBAgAGBQJMqI5zAAoJEIrPJfWinA2uf30H/2DdM9mjINOcvsXaRwqNYIu6
Z+jgulDXNlQHxuUzSgmtr9bNG9QjSiomNI/xvQ4QOHOeUcKdYQdqHgkDWdw+oUr6
fJET+zM4oMiiPpaqHUMANbuMKxQkA+rM5DYvnDegdmHnGOvfqMBJLFYAi+ieoxr8
55tor2X5mhV6mMHZi9DOxuPHpVLu7NxsIkn5Gs1SHi3DF8SSWXdHziaF5svLuZaa
QAc1Yu6zH5jYfgtJkxuG+c7r3n7ZrnVTLY+c067+tR+grhOsmQPMSIOHDJE91bx7
BmcYSGPXHBzzIeh+Di0Srm1l4p6UIl99OKrHF6OZooUJTZeNZN6ZZ5NClIaoJCY=
=pX9k
-----END PGP SIGNATURE-----