From: Junio C Hamano <gitster@pobox.com>
To: David Aguilar <davvid@gmail.com>
Cc: git@vger.kernel.org, Markus Heidelberg <markus.heidelberg@web.de>,
Johannes Gilger <heipei@hackvalue.de>
Subject: Re: [PATCH] contrib/difftool: Don't repeat merge tool candidates
Date: Sat, 31 Jan 2009 17:35:53 -0800 [thread overview]
Message-ID: <7vskmzym4m.fsf@gitster.siamese.dyndns.org> (raw)
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
prev parent reply other threads:[~2009-02-01 1:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-31 20:27 [PATCH] contrib/difftool: Don't repeat merge tool candidates David Aguilar
2009-02-01 1:35 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vskmzym4m.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=heipei@hackvalue.de \
--cc=markus.heidelberg@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).