Configuring AptDiff / using multiple merge tools

[miinx]

On 2 November 2010 13:26, Mads Kiilerich <mads at kiilerich.com> wrote:

> On 11/02/2010 01:24 PM, miinx wrote:
>
>> Hi there,
>>
>> I am trying to configure Mercurial to use AptDiff
>> (http://www.aptedit.com/aptdiff.htm) for merging binary files, but I
>> keep getting the error
>> "couldn't find merge tool aptdiff specified for **.mtr"
>> when I try and merge files with it.
>>
>> My Mercurial.ini file has the following (relevant bits):
>>
>> -----------
>> [merge-tools]
>> # AptDiff
>> aptdiff.executable = "C:\Program Files\AptDiff\aptdiff.exe"
>>
>
> Try to leave out the quotes.
>
> /Mads
>



-- 
miinx .: testing :.
testinggirl at gmail.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20101103/78d6aabe/attachment.htm>