diff options
| author |  David Aguilar <davvid@gmail.com> | 2009-01-31 12:27:56 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-01-31 17:35:06 -0800 |
| commit | 99ccabaffa201e867f2073947dcccae3947ec4f1 (patch) | |
| tree | 647ffb8e8b5a9d24e47ff78d6639238923b3ce04 /t/t5515/fetch.br-config-explicit-merge_config-explicit | |
| parent | contrib/difftool: add support for Kompare (diff) | |
| download | tgif-99ccabaffa201e867f2073947dcccae3947ec4f1.tar.xz | |
contrib/difftool: Don't repeat merge tool candidates
git difftool listed some candidates for mergetools twice, depending on
the environment.
This slightly changes the behavior when both KDE_FULL_SESSION and
GNOME_DESKTOP_SESSION_ID are set at the same time; in such a case
meld is used in favor of kdiff3 (the old code favored kdiff3 in such a
case), but it should not matter in practice.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/fetch.br-config-explicit-merge_config-explicit')
0 files changed, 0 insertions, 0 deletions