mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetools: simplify how we handle "vim" and "defaults"

Browse Source 
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 <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar
2013-01-26 16:46:12 -08:00
committed by Junio C Hamano
parent 62957bea0c
commit 073678b8e6
6 changed files with 34 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mergetools/gvimdiff Normal file
View File

@ -0,0 +1 @@
. "$MERGE_TOOLS_DIR/vimdiff"