mirror of
https://github.com/git/git.git
synced 2024-04-19 20:03:46 +02:00
073678b8e6
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>
2 lines
29 B
Plaintext
2 lines
29 B
Plaintext
. "$MERGE_TOOLS_DIR/vimdiff"
|