couldn't find merge tool hgmerge

[Pascal Bourguignon]

On 2 janv. 2013, at 17:01, Adrian Klaver wrote:

> On 01/02/2013 07:46 AM, Pascal Bourguignon wrote:
>>
>> 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:
>>
>
> Would seem you do not have to:
>
> http://mercurial.selenic.com/wiki/MergeToolConfiguration
>
> "... For backwards compatibility, the tool hgmerge is implicitly added
> with lowest priority..."
>
> My guess is you do not have a merge tool set up and hg is falling back
> to hgmerge.

Ok, so I had this:

[ui]
merge=internal:merge

to my ~/.hgrc and it works nicely now.

Thanks to all.

--
__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.