From: Johannes Gilger <heipei@hackvalue.de>
Date: Fri, 23 Jan 2009 23:12:45 +0000 (+0100)
Subject: mergetool: Don't repeat merge tool candidates
X-Git-Tag: v1.6.2-rc0~50^2
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/fb700cb0679e22900f0d1435641e6cf7c652968b?hp=fb700cb0679e22900f0d1435641e6cf7c652968b

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>
---