On 01/02/2013 04:17 PM, Pascal Bourguignon wrote: > When I use hg merge, I get this error message: > > couldn't find merge tool hgmerge That is probably because you have some local configuration that tells Mercurial to use 'hgmerge'. See 'hg help merge', 'hg help merge-tools' and 'hg showconfig --debug'. /Mads