From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Sat, 31 Jan 2009 10:41:23 GMT
Subject: Re: [PATCH] contrib/difftool: add support for Kompare
Message-ID: <200901311141.23986.markus.heidelberg@web.de>
In-Reply-To: <20090131063714.GA29621@gmail.com>

David Aguilar, 31.01.2009:
> On  0, Markus Heidelberg <markus.heidelberg@web.de> wrote:
> > 
> > Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
> > ---
> >  contrib/difftool/git-difftool-helper |   16 ++++++++++------
> >  contrib/difftool/git-difftool.txt    |    3 ++-
> >  2 files changed, 12 insertions(+), 7 deletions(-)
> 
> 
> Good stuff =)
> Should we patch mergetool with the same change?
> Kompare's pretty popular in KDE land.

But Kompare cannot merge. It is kind of a diff/patch frontend, it takes
only one or two files (or directories) as arguments.

> BTW git.git's next branch has:
> 
> commit fb700cb0679e22900f0d1435641e6cf7c652968b
> Author: Johannes Gilger <heipei@hackvalue.de>
> Date:   Sat Jan 24 00:12:45 2009 +0100
> 
>     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>
> 
> 
> difftool probably needs a similar patch.
> I'll see if I can get to that this weekend if no one beats
> me to it.

Yes, the change would make sense here, too.

Markus