git/mergetools/vimdiff2 at 4dd7c77d19d42f6981ba4cdcda91755e5587cc28 - mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-10-31 06:17:56 +01:00

David Aguilar 073678b8e6 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>

2013-01-28 19:00:38 -08:00

1 line

29 B

Text

Raw Blame History

. "$MERGE_TOOLS_DIR/vimdiff"