couldn't find merge tool hgmerge
Adrian Klaver
adrian.klaver at gmail.com
Wed Jan 2 16:01:59 UTC 2013
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.
--
Adrian Klaver
adrian.klaver at gmail.com
More information about the Mercurial
mailing list