tree bea3696ce802875e371f45e8af0281edd4810c9a
parent 47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc
author pudinha <rogi@skylittlesystem.org> 1596058272 +0100
committer Junio C Hamano <gitster@pobox.com> 1596059086 -0700

mergetool--lib: improve support for vimdiff-style tool variants

The merge tools vimdiff2, vimdiff3, gvimdiff2, gvimdiff3 and bc3 are all
variants of the main tools vimdiff and bc. They are implemented in the
main and a one-liner script that just sources it exist for each.

Allow variants ending in [0-9] to be correctly wired without the need
for such one-liners, so instead of 5 scripts, only 1 (gvimdiff) is
needed.

Signed-off-by: pudinha <rogi@skylittlesystem.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>