| commit | 61ed71dcff8448b0700ef032aa1f962649306624 | |
| author | David Aguilar <davvid@gmail.com> | |
| Sun, 10 Jan 2010 04:02:41 +0000 (9 20:02 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Jan 2010 06:41:29 +0000 (9 22:41 -0800) | ||
| tree | ab6c9baa1021cd234ea7505d209a4bcd5e7349bc | treesnapshot (tar.gz zip) |
| parent | db367136605868f5971d42501a48820ccdcb8b08 | commitdiff |
difftool--helper: Remove use of the GIT_MERGE_TOOL variable
An undocumented mis-feature in git-difftool is that it allows you
to specify a default difftool by setting GIT_MERGE_TOOL.
This behavior was never documented and was included as an
oversight back when git-difftool was maintained outside of git.
git-mergetool never honored GIT_MERGE_TOOL so neither should
git-difftool.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
An undocumented mis-feature in git-difftool is that it allows you
to specify a default difftool by setting GIT_MERGE_TOOL.
This behavior was never documented and was included as an
oversight back when git-difftool was maintained outside of git.
git-mergetool never honored GIT_MERGE_TOOL so neither should
git-difftool.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-difftool--helper.sh | diffblobblamehistory | |
| t/t7800-difftool.sh | diffblobblamehistory |