From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 01 Feb 2009 01:35:53 GMT
Subject: Re: [PATCH] contrib/difftool: Don't repeat merge tool candidates
Message-ID: <7vskmzym4m.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1233433676-21944-1-git-send-email-davvid@gmail.com>

David Aguilar <davvid@gmail.com> writes:

> 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>
> ---
>
> Hi Junio
>
> This is based on top of Markus's kompare patch:
> 	"contrib/difftool: add support for Kompare"
> 	http://article.gmane.org/gmane.comp.version-control.git/107883

Ok, so I'll add "Acked-by: David Aguilar <davvid@gmail.com>" to Markus's
patch and apply it.

Thanks