| commit | 99ccabaffa201e867f2073947dcccae3947ec4f1 | |
| author | David Aguilar <davvid@gmail.com> | |
| Sat, 31 Jan 2009 20:27:56 +0000 (31 12:27 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 1 Feb 2009 01:35:06 +0000 (31 17:35 -0800) | ||
| tree | 647ffb8e8b5a9d24e47ff78d6639238923b3ce04 | treesnapshot (tar.gz zip) |
| parent | 384770a5e79938b6a7633c5996597ef3211e4a7c | commitdiff |
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>
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>
| contrib/difftool/git-difftool-helper | diffblobblamehistory |