| commit | 073678b8e6324a155fa99f40eee0637941a70a34 | |
| author | David Aguilar <davvid@gmail.com> | |
| Sun, 27 Jan 2013 00:46:12 +0000 (26 16:46 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 29 Jan 2013 03:00:38 +0000 (28 19:00 -0800) | ||
| tree | f9bdd837ffdfb50efabf58a73769477202e70b50 | treesnapshot (tar.gz zip) |
| parent | 62957bea0c7637ae1db4452fc165c59d9408585b | commitdiff |
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>
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>
| git-mergetool--lib.sh | diffblobblamehistory | |
| mergetools/defaults | [deleted file] | blobblamehistory |
| mergetools/gvimdiff | [new file with mode: 0644] | blob |
| mergetools/gvimdiff2 | [new file with mode: 0644] | blob |
| mergetools/vimdiff | [moved from mergetools/vim with 100% similarity] | blobblamehistory |
| mergetools/vimdiff2 | [new file with mode: 0644] | blob |