Git https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=v2.26.0-rc2 2013-01-29T03:00:38Z 2013-01-29T03:00:38Z David Aguilar davvid@gmail.com 2013-01-27T00:46:12Z urn:sha1:073678b8e6324a155fa99f40eee0637941a70a34 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>