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/vimdiff3 | |
| parent | Git 2.28 (diff) | |
| download | git-83bbf9b92ea8a10a60f44369a200b39ce5db78cd.tar.gz git-83bbf9b92ea8a10a60f44369a200b39ce5db78cd.zip | |
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/vimdiff3')
| -rw-r--r-- | mergetools/vimdiff3 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mergetools/vimdiff3 b/mergetools/vimdiff3 deleted file mode 100644 index 04a5bb0ea8..0000000000 --- a/mergetools/vimdiff3 +++ /dev/null @@ -1 +0,0 @@ -. "$MERGE_TOOLS_DIR/vimdiff" |