Resolving conflicts with Bazaar Explorer

[Ian Clatworthy]

Talden wrote:
> On Thu, Nov 26, 2009 at 3:44 AM, Gordon Tyler <gordon at doxxx.net> wrote:
>> So it looks like bzr extmerge handles kdiff3 automatically. If it finds on
>> the path, it uses the correct command line.
>>
>> However, I don't think this is the case for bzr explorer's external merge
>> tools so you have to give the command line:
>>
>> /path/to/kdiff3 --output %r %b %t %o
>>
>> It would be nice if bzr explorer used bzr extmerge.
> 
> And I have this one for Beyond Compare 3
> 
> external_merge = 'c:/Progra~1/Beyond~1/BComp.exe %t %o %b %r'

If anyone can spare a few hours, it would be great to get this external
tool setup simplified. I'm sure we could make it much easier and less
error prone than it is currently, learning from extmerge and difftools.
See https://bugs.launchpad.net/qbzr/+bug/416927.

Another helpful thing would be adding extmerge to the Windows installer.
Any takers?

Ian C.