From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Mar 2012 20:53:08 GMT
Subject: Re: [PATCH 1/2] mergetools: split config files for vim and gvim
Message-ID: <7vr4wctpl7.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1332964693-4058-1-git-send-email-tim.henigan@gmail.com>

Tim Henigan <tim.henigan@gmail.com> writes:

> One side-effect of this change which may be a problem is that we
> lose support for the 'vimdiff2' and 'gvimdiff2' tools that were
> created in 0008669 (mergetool-lib: make the three-way diff the
> default for vim/gvim).  The 2-panel options were not advertised in
> any way, so I don't know if it is important to keep them.

By default, anything we support is important unless there is a sound
justification to say otherwise.  I think they were kept for people who
were already used to the 2-pane version when 3-pane one was introduced.

But I will not be a good judge for this particular case, as I do not use
vim nor gvim for merge resolution.  Davidd?