David Aguilar 99ccabaffa 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>		2009-01-31 17:35:06 -08:00
..
git-difftool	difftool: fix documentation problems	2009-01-18 22:44:13 -08:00
git-difftool-helper	contrib/difftool: Don't repeat merge tool candidates	2009-01-31 17:35:06 -08:00
git-difftool.txt	contrib/difftool: add support for Kompare	2009-01-31 17:34:58 -08:00