[PATCH 2 of 3] mergetools.hgrc: disable vimdiff as a valid proposal for default mergetools

[Greg Ward]

On 02 August 2012, pierre-yves.david at logilab.fr said:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at logilab.fr>
> # Date 1343908321 -7200
> # Branch stable
> # Node ID 68604f26c8b5962dd6bfc3099f6fa3e428fbc91d
> # Parent  192441ab174c489bd7bbc61d8bd0e4658f79aeaf
> mergetools.hgrc: disable vimdiff as a valid proposal for default mergetools.

+1000. 

I've seen competent, professional programmers reduced to complete
stupefaction by vimdiff. I scoffed cruelly at them until it happened
to me once, doing a merge in an SSH session without DISPLAY set. Spent
5 minutes reading the man page just to learn how to quit vimdiff.
*sigh*

-- 
Greg Ward                                http://www.gerg.ca/
I repeat myself when under stress I repeat myself when under stress I repeat---