| commit | fb700cb0679e22900f0d1435641e6cf7c652968b | |
| author | Johannes Gilger <heipei@hackvalue.de> | |
| Fri, 23 Jan 2009 23:12:45 +0000 (24 00:12 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Jan 2009 09:11:59 +0000 (27 01:11 -0800) | ||
| tree | cc8b47fca827efea03465811485cc52dc16a89d6 | treesnapshot (tar.gz zip) |
| parent | b80da424a13107c239ed40573fae3d692d19b6cd | commitdiff |
mergetool: Don't repeat merge tool candidates
git mergetool 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: Johannes Gilger <heipei@hackvalue.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git mergetool 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: Johannes Gilger <heipei@hackvalue.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-mergetool.sh | diffblobblamehistory |