projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b80da42) | patch
mergetool: Don't repeat merge tool candidates
authorJohannes Gilger <heipei@hackvalue.de>
Fri, 23 Jan 2009 23:12:45 +0000 (00:12 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Jan 2009 09:11:59 +0000 (01:11 -0800)
commitfb700cb0679e22900f0d1435641e6cf7c652968b
treecc8b47fca827efea03465811485cc52dc16a89d6tree | snapshot
parentb80da424a13107c239ed40573fae3d692d19b6cdcommit | diff
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.sh diff | blob | history
Git—the stupid content tracker