]> git.ipfire.org Git - thirdparty/git.git/commit
mergetool--lib: improve support for vimdiff-style tool variants
authorpudinha <rogi@skylittlesystem.org>
Wed, 29 Jul 2020 21:31:12 +0000 (22:31 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Jul 2020 21:44:46 +0000 (14:44 -0700)
commit83bbf9b92ea8a10a60f44369a200b39ce5db78cd
treebea3696ce802875e371f45e8af0281edd4810c9a
parent47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc
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>
git-mergetool--lib.sh
mergetools/bc
mergetools/bc3 [deleted file]
mergetools/gvimdiff2 [deleted file]
mergetools/gvimdiff3 [deleted file]
mergetools/vimdiff
mergetools/vimdiff2 [deleted file]
mergetools/vimdiff3 [deleted file]