From 83bbf9b92ea8a10a60f44369a200b39ce5db78cd Mon Sep 17 00:00:00 2001 From: pudinha Date: Wed, 29 Jul 2020 22:31:12 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- mergetools/vimdiff2 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 mergetools/vimdiff2 (limited to 'mergetools/vimdiff2') diff --git a/mergetools/vimdiff2 b/mergetools/vimdiff2 deleted file mode 100644 index 04a5bb0ea8..0000000000 --- a/mergetools/vimdiff2 +++ /dev/null @@ -1 +0,0 @@ -. "$MERGE_TOOLS_DIR/vimdiff" -- cgit v1.2.3