Resolving conflicts with Bazaar Explorer

[A. S. Budden]

2009/11/26 Alexander Belchenko <bialix at ukr.net>:
> 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.
>
> The good start would be to collect all recipes (command-lines) into one wiki page, so we can encode
> them into qbzr.

I think this would be really useful: I was trying to select a good
merge tool, so I downloaded all the free cross-platform ones I could
find (diffmerge, diffuse and p4merge), but I couldn't get diffuse
working (problems with where to put the %r from memory) and I seem to
remember struggling with (configuring and using) p4merge, so I went
with diffmerge.

Al


-- 
http://sites.google.com/site/abudden