Problems with default value of merge tool

[Pierre-Yves David]

On 11/12/2015 11:49 AM, Matt Mackall wrote:
> On Thu, 2015-11-12 at 12:15 +0000, Alan Mackenzie wrote:
>> Hello, Mercurial.
>>
>> I'm running Mercurial 3.3.2 on Gentoo GNU/Linux.
>>
>> Last night I had an unpleasant experience with hg.  On doing an hg
>> graft, there were merge conflicts, and hg opened some angry fruit
>> salad
>> merging tool.
>>
>> I wasn't familiar with this tool, and in fact, I don't even know what
>> it
>> was.  By experimentation, I managed to get out of it typing ":q"
>> (three
>> times).  I think hg then asked me if the merge had been successful,
>> and
>> I said "no".
>
> Welcome to vimdiff. I hate vim and vimdiff too, but as you've probably
> already read, some people love it. Which means that if we disable it by
> default, we will make people who've already configured their
> environment to their liking have a bad day. Breaking one set of users'
> configs to make another set happy is not the sort of trade-off we like
> to make.

I remember a discussion with Mads Kiilerich where we concluded that we 
should probably not have an actual default merge tools (because it is 
almost alway providing a confusing result for users).

The idea would be to have a default merge tool that display available 
choice and prompt the user to configure one he is comfortable with. This 
issue is coming up frequently enough that we should probably make it 
happen. I wonder what other people think.

-- 
Pierre-Yves David