External merge tool support (WIP)

[Martin Pool]

On 5 August 2010 10:44, 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.

That sounds good.   'bzr resolve' only for "tell bzr it's resolved" is
a bit weak.

> If the merge tool terminates with an exit
> code of 0, the file is marked as resolved as 'bzr resolve <file>' would.

I wonder about that; it seems like often the tool itself will exit
successfully regardless of whether the conflicts are resolved.

To me it seems the main test should be whether the conflict markers
have been removed.

-- 
Martin