summaryrefslogtreecommitdiff
path: root/mergetools/bc
diff options
context:
space:
mode:
authorLibravatar pudinha <rogi@skylittlesystem.org>2020-07-29 22:31:12 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-07-29 14:44:46 -0700
commit83bbf9b92ea8a10a60f44369a200b39ce5db78cd (patch)
treebea3696ce802875e371f45e8af0281edd4810c9a /mergetools/bc
parentGit 2.28 (diff)
downloadtgif-83bbf9b92ea8a10a60f44369a200b39ce5db78cd.tar.xz
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>
Diffstat (limited to 'mergetools/bc')
-rw-r--r--mergetools/bc5
1 files changed, 5 insertions, 0 deletions
diff --git a/mergetools/bc b/mergetools/bc
index 3a69e60faa..a89086ee72 100644
--- a/mergetools/bc
+++ b/mergetools/bc
@@ -21,3 +21,8 @@ translate_merge_tool_path() {
echo bcompare
fi
}
+
+list_tool_variants () {
+ echo bc
+ echo bc3
+}