diff options
| author | pudinha <rogi@skylittlesystem.org> | 2020-07-29 22:31:12 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-29 14:44:46 -0700 |
| commit | 83bbf9b92ea8a10a60f44369a200b39ce5db78cd (patch) | |
| tree | bea3696ce802875e371f45e8af0281edd4810c9a /mergetools/vimdiff | |
| parent | 47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc (diff) | |
| download | git-83bbf9b92ea8a10a60f44369a200b39ce5db78cd.tar.gz | |
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/vimdiff')
| -rw-r--r-- | mergetools/vimdiff | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff index 10d86f3e19..3925e1fc3e 100644 --- a/mergetools/vimdiff +++ b/mergetools/vimdiff @@ -46,3 +46,11 @@ translate_merge_tool_path() { exit_code_trustable () { true } + +list_tool_variants () { + for prefix in '' g; do + for suffix in '' 2 3; do + echo "${prefix}vimdiff${suffix}" + done + done +} |