Configuring AptDiff / using multiple merge tools

miinx testinggirl at gmail.com
Wed Nov 3 08:40:47 UTC 2010


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?

Thanks again.


On 3 November 2010 08:37, Mads Kiilerich <mads at kiilerich.com>:

>
> Try to leave out the quotes.
>>
>> /Mads
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20101103/dcb86412/attachment.html>


More information about the Mercurial mailing list