couldn't find merge tool hgmerge

[Pascal Bourguignon]

On 2 janv. 2013, at 16:29, Pierre-Yves David wrote:

> On Wed, Jan 02, 2013 at 09:17:27AM -0600, Pascal Bourguignon wrote:
>> When I use hg merge, I get this error message:
>>
>> couldn't find merge tool hgmerge
>>
>> How to resolve it?
>>
>> The environment variable HGMERGE is empty, and despite a full install of mercurial (Mercurial Distributed SCM (version 2.4.1)), there's no hgmerge tool installed.
>
> check you merge tool config
>
> hg showconfig ui
> hg showconfig merge-tools


Well, no, I don't have anything configured about hgmerge:

[pbourguignon at iMac-Core-i5 :0.0 work1]$ hg showconfig --debug
read config from: /usr/local/etc/mercurial/hgrc
read config from: /etc/mercurial/hgrc
read config from: /Users/pbourguignon/.hgrc
none: bundle.mainreporoot=/private/tmp/subrepo-test-36115/work1
/Users/pbourguignon/.hgrc:10: extensions.hgext.convert=
/Users/pbourguignon/.hgrc:11: extensions.graphlog=
/Users/pbourguignon/src/mercurial-tests/Tools/hooks/hooks.rc:4: hooks.update=python:$DXO_HG_HOOKS/dxodep.py:update_dependencies
/Users/pbourguignon/src/mercurial-tests/Tools/hooks/hooks.rc:7: hooks.pre-commit=$DXO_HG_HOOKS/pre-commit
/Users/pbourguignon/.hgrc:6: ui.username="Pascal Bourguignon <pbourguignon at dxo.com>"
none: ui.verbose=False
none: ui.debug=True
none: ui.quiet=False
[pbourguignon at iMac-Core-i5 :0.0 work1]$ hg showconfig ui
ui.username="Pascal Bourguignon <pbourguignon at dxo.com>"
ui.verbose=True
[pbourguignon at iMac-Core-i5 :0.0 work1]$ hg showconfig merge-tools
[pbourguignon at iMac-Core-i5 :0.0 work1]$ env|grep HGMERGE
[pbourguignon at iMac-Core-i5 :0.0 work1]$



--
__Pascal Bourguignon__
Ingénieur Développement Logiciel Mac OSX.
DxO Consumers, SAS.
mailto:pbourguignon at dxo.com






 ------------------------------------------------------------------------------
This message and any attachments (the "message") are confidential and intended solely for the addressee(s). Any unauthorised use or dissemination is prohibited. E-mails are susceptible to alteration. Neither DxO Labs nor any of its subsidiaries or affiliates shall be liable for the message if altered, changed or falsified.
Ce message et toutes les pieces jointes (ci-apres le "message") sont confidentiels et etablis a l'intention exclusive de ses destinataires. Toute utilisation ou diffusion non autorisee est interdite. Tout message electronique est susceptible d'alteration. DxO Labs et ses filiales declinent toute responsabilite au titre de ce message s'il a ete altere, modifie ou falsifie.