Configuring AptDiff / using multiple merge tools
Mads Kiilerich
mads at kiilerich.com
Wed Nov 3 10:24:58 UTC 2010
On 11/03/2010 09:40 AM, miinx wrote:
> Oops sorry about that! Got confused with the replying... trying again:
>
>
> Thanks Mads, however unfortunately without the quotes Mercurial baulks.
What is the output of "hg merge -v --debug"?
What do "set PATH" show?
"dir C:\Program Files\AptDiff\aptdiff.exe"?
"hg showconfig merge-tools" (only the aptdiff entries)
What Mercurial version are you using - and from which installer? Do you
use cygwin?
/Mads
More information about the Mercurial
mailing list