git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] contrib/difftool: Don't repeat merge tool candidates

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 1, 2009, 01:35 UTC
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:
Show 16 quoted lines
> 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
Previous: David Aguilar
Message 2 of 2 in “contrib/difftool: Don't repeat merge tool candidates”
  1. contrib/difftool: Don't repeat merge tool candidatesDavid Aguilar, Jan 31, 2009
  2. Junio C HamanoFeb 1, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.