From 073678b8e6324a155fa99f40eee0637941a70a34 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 26 Jan 2013 16:46:12 -0800 Subject: mergetools: simplify how we handle "vim" and "defaults" Remove the exceptions for "vim" and "defaults" in the mergetool library so that every filename in mergetools/ matches 1:1 with the name of a valid built-in tool. Define the trivial fallback definition of shell functions in-line in git-mergetool-lib script, instead of dot-sourcing them from another file. The result is much easier to follow. [jc: squashed in an update from John Keeping as well] Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- mergetools/gvimdiff2 | 1 + 1 file changed, 1 insertion(+) create mode 100644 mergetools/gvimdiff2 (limited to 'mergetools/gvimdiff2') diff --git a/mergetools/gvimdiff2 b/mergetools/gvimdiff2 new file mode 100644 index 0000000000..04a5bb0ea8 --- /dev/null +++ b/mergetools/gvimdiff2 @@ -0,0 +1 @@ +. "$MERGE_TOOLS_DIR/vimdiff" -- cgit v1.2.3