diff options
| author | David Aguilar <davvid@gmail.com> | 2010-01-10 04:02:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-10 06:41:29 (GMT) |
| commit | 61ed71dcff8448b0700ef032aa1f962649306624 (patch) | |
| tree | ab6c9baa1021cd234ea7505d209a4bcd5e7349bc /builtin-fmt-merge-msg.c | |
| parent | db367136605868f5971d42501a48820ccdcb8b08 (diff) | |
| download | git-61ed71dcff8448b0700ef032aa1f962649306624.zip git-61ed71dcff8448b0700ef032aa1f962649306624.tar.gz git-61ed71dcff8448b0700ef032aa1f962649306624.tar.bz2 | |
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>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions