Configuring AptDiff / using multiple merge tools
miinx
testinggirl at gmail.com
Tue Nov 2 07:24:08 CDT 2010
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"
aptdiff.args = -h $base $local
aptdiff.premerge = False
aptdiff.binary = True
aptdiff.gui = True
[merge-patterns]
**.mtr = aptdiff
-----------
and AptDiff does exist at that location. KDiff3 is also configured & working
fine.
Any help with where I'm going wrong appreciated.
Thanks in advance.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20101102/5f4cb367/attachment.htm>
More information about the Mercurial
mailing list