mergetools: simplify how we handle "vim" and "defaults"
authorDavid Aguilar <>
Sun, 27 Jan 2013 00:46:12 +0000 (16:46 -0800)
committerJunio C Hamano <>
Tue, 29 Jan 2013 03:00:38 +0000 (19:00 -0800)
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 <>
Signed-off-by: Junio C Hamano <>
mergetools/defaults [deleted file]
mergetools/gvimdiff [new file with mode: 0644]
mergetools/gvimdiff2 [new file with mode: 0644]
mergetools/vimdiff [moved from mergetools/vim with 100% similarity]
mergetools/vimdiff2 [new file with mode: 0644]