Configuring AptDiff / using multiple merge tools

Steve Borho steve at borho.org
Wed Nov 3 09:12:01 UTC 2010


On Wed, Nov 3, 2010 at 3:40 AM, miinx <testinggirl at gmail.com> wrote:
> Oops sorry about that!  Got confused with the replying... trying again:
>
>
> Thanks Mads, however unfortunately without the quotes Mercurial baulks.
> I've found that adding
>
>    [ui]
>    merge = "C:\Program Files\AptDiff\aptdiff.exe"
>
> gets it working, but it seems this sets it as the default tool, which is not
> what I want.  Previously had it set to KDiff3, but AptDiff only works when
> it's the last setting for "merge" there.
>
> Interested to know if there is a better way?

One alternative is to add the AptDiff folder to your path, then set
the executable var to just aptdiff.exe.

Another is to try executable=%ProgramFiles%\AptDiff\aptdiff.exe

But honestly, I don't understand why the unquoted string is not working for you.

-- 
Steve Borho



More information about the Mercurial mailing list