diff options
| author |  Johannes Gilger <heipei@hackvalue.de> | 2009-01-24 00:12:45 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-01-27 01:11:59 -0800 |
| commit | fb700cb0679e22900f0d1435641e6cf7c652968b (patch) | |
| tree | cc8b47fca827efea03465811485cc52dc16a89d6 /merge-recursive.h | |
| parent | git-am: implement --reject option passed to git-apply (diff) | |
| download | tgif-fb700cb0679e22900f0d1435641e6cf7c652968b.tar.xz | |
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>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions