[PATCH] mergetools.hgrc: add minimal configuration for editmerge

[Pierre-Yves David]

On 05/30/2014 05:01 AM, Mads Kiilerich wrote:
> On 05/29/2014 10:56 PM, Pierre-Yves David wrote:
>>
>>
>> On 05/29/2014 12:54 PM, Mads Kiilerich wrote:
>>> Shouldn't it also have a (unique) priority?
>>>
>>> The actual priority would probably be the subject of some bikeshedding,
>>> but it is better to have the discussion and make a choice than letting
>>> it "randomly" pick among other tools with same priority.
>>
>> The tool is not installed at all. So it will never be picked. The
>> config is here to prevent the following scenario
>>
>> <babar> let's try this nice script
>> <babar> I added ui.merge=/path/to/editmerge in my config. I'm set
>> <babar> lets rebase the world to test that
>> <babar> ☹ no conflit to test my file
>> time pass
>> <babar> Why did I lost half of my patches content‽
>> vel
>>
>
> If that is the intention, it should have a very low priority.

agree

> Would it make sense to make editmerge a builtin tool, cross platform and
> everything?

Probably

-- 
Pierre-Yves David