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: NDavid Aguilar <davvid@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
Showing
mergetools/defaults
已删除
100644 → 0
mergetools/gvimdiff
0 → 100644
mergetools/gvimdiff2
0 → 100644
mergetools/vimdiff2
0 → 100644
想要评论请 注册 或 登录