Resolving conflicts with Bazaar Explorer

[Talden]

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'

--
Talden