[PATCH STABLE] mergetools: vimdiff issue a warning explaining how to abort

[Pierre-Yves David]

On 15 févr. 2013, at 22:13, Kevin Bullock wrote:

> On 15 Feb 2013, at 3:12 PM, Kevin Bullock wrote:
> 
>> On 15 Feb 2013, at 2:08 PM, Matt Mackall wrote:
>> 
>>> On Fri, 2013-02-15 at 13:21 +0100, Benoit Boissinot wrote:
>>>> Looks good.
>>> 
>>>>> -vimdiff.args=$local $other $base
>>>>> +vimdiff.args=$local $other $base -c 'echohl WarningMsg | echo "merge
>>>>> conflict detected, type \":cq\" to abort" | echohl'
>>> 
>>> Actually, it's not so good. I get an otherwise blank screen that says:
>>> 
>>> "smem" 676L, 20653C
>>> merge conflict detected, type ":cg" to abort
>>> Press ENTER or type command to continue
>>> 
>>> If I were an everyday vimdiff user[1], I would be pissed off by this
>>> change in very short order. Especially if I were resolving 10 conflicts
>>> in a row.
>>> 
>>> And if I were a NON-vimdiff user, I'd still have just about no idea what
>>> just happened or how to avoid it in the future.
>> 
>> Just crewed this (after having queued the patch before seeing Matt's response):
> 
> Oh, and I crewed them on default -- this isn't stable-appropriate.

I've seen multiple data lose from editor misusage.

We should probably reconsider that for stable.

(on a related topic, having the patch on stable will help me to harass the Debian maintainer until the config is patched for wheezy)


-- 
Pierre-Yves David