summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2013-01-26 16:46:12 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-28 19:00:38 -0800
commit073678b8e6324a155fa99f40eee0637941a70a34 (patch)
treef9bdd837ffdfb50efabf58a73769477202e70b50 /Documentation/git-checkout.txt
parent62957bea0c7637ae1db4452fc165c59d9408585b (diff)
downloadgit-073678b8e6324a155fa99f40eee0637941a70a34.tar.gz
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 <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-checkout.txt')
0 files changed, 0 insertions, 0 deletions