External merge tool support (WIP)

[Maritza Mendez]

I plan to pull your branches and try them out on Windows tomorrow for feedback.

Thanks!
~M


On 8/4/10, Gordon Tyler <gordon.tyler at gmail.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> I've made some changes in response to the feedback in this thread:
>
> The 'bzr mergetool' command has been removed and instead I've added a
> '--using <tool>' option to the 'bzr resolve' command, which invokes the
> tool for each file specified or all files with unresolved conflicts if
> the '--all' option is given. If the merge tool terminates with an exit
> code of 0, the file is marked as resolved as 'bzr resolve <file>' would.
>
> I have also renamed the '--tool' option on the 'bzr merge' command to
> '--using'.
>
> lp:~doxxx/bzr/mergetools
> lp:~doxxx/qbzr/mergetools
>
> Comments and criticism are welcome.
>
> Ciao,
> Gordon
>
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.10 (MingW32)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iQEcBAEBAgAGBQJMWgl1AAoJEIrPJfWinA2uuJgH/AyfVotbeyMVzPmfdbqFnjcC
> GtsVy6T6s6MGp0D68o3t/VBj0XJ69ivCWAR+YEmBCywx6K2CAj+OTZua05Ayf4v8
> nDCHwzokAUe3tQhH8LwzZvk/g9kAdRGQKcJlankpJ8dAmOO0sO+xmn9+wlgEGrOu
> F064i4cm87PudYuifbVWILBF5vJLBdwOw/hCDhK3djENCW/tcxXvsBXiNg28DPwS
> RAWSN1YEvaiGZkLG2QN9M63JEGUZP5NPXC9agdKV3y+uJuzL/C+jbniiBT65iw88
> CXJs2X9EhrVblhryyUuMzLvaVoAdvER29nAqrc4AR/OaHHi4cmtntEg3fVchbl0=
> =KfLL
> -----END PGP SIGNATURE-----
>
>