Tim Henigan [off-list ref] 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?