External merge tool support (WIP)

[Gordon Tyler]

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

On 8/4/2010 10:15 PM, Maritza Mendez wrote:
> I plan to pull your branches and try them out on Windows tomorrow for feedback.

Thanks. I have some plans for the qconflicts and qconfig UI but if you
have any suggestions, please let me know.

Ciao,
Gordon

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

iQEcBAEBAgAGBQJMWjPqAAoJEIrPJfWinA2uEy0H/1jwXqvZVdzF6Hthe1e8MKjJ
VoC4KivIS2YC66lcsR/kyiRwm8/6ZoLWViNiTe3/q3+8ehzAw78PkmpekdCO1CX0
dy4+80LlaVijC1R3CKoJLXFbicwQISZ0nr77PRvCCaXQge5V4binoWOtkN0rKrtC
SkGGdn/PXDDVOGtj+zcdAAnCM7AbkN7BeBxJXSpP00/8XPKh6PyRCFtKD27+JKOx
r29zmSCJA6mLIr9Rgan7FkZoZrZUebuEP26qJRth0Kw6OpHeA9np3U2jJOBJlwNb
Fc88PLtVvM0PVpnpDp9HE4BWLPCF2N4ymIikpNCBhKl+Iqyf5tbtymRj1BZfhVg=
=KaGy
-----END PGP SIGNATURE-----