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

Re: [PATCH] mergetool--lib: add diffmerge as a pre-configured mergetool option

From
Jay Soffian <jaysoffian@gmail.com>
Date
Dec 9, 2009, 23:14 UTC
Message-ID
<76718490912091514l16f6dd71g3f644ccf4ef5835c@mail.gmail.com>
In-Reply-To
<20091209223409.GA32744@hashpling.org>
On Wed, Dec 9, 2009 at 2:34 PM, Charles Bailey <charles@hashpling.org> wrote:
> Is diffmerge free but not Free?

Correct, it's free as in beer, not as in speech. It is multi-platform though (Linux, Windows, OS X). I've tested only on MacOS X. If someone else wants to give it a test on Linux, that would be good. Looks like there's both a deb and an rpm:

http://www.sourcegear.com/diffmerge/downloads.html
> Any reason for holding back on sign-off?
Oversight:
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
j.
Previous: Charles BaileyNext: Junio C Hamano
Message 3 of 7 in “mergetool--lib: add diffmerge as a pre-configured mergetool option”
  1. mergetool--lib: add diffmerge as a pre-configured mergetool optionJay Soffian, Dec 8, 2009
  2. Charles BaileyDec 9, 2009
  3. Jay SoffianDec 9, 2009
  4. Junio C HamanoDec 10, 2009
  5. Jay SoffianDec 10, 2009
  6. David AguilarAug 16, 2011
  7. Junio C HamanoAug 16, 2011

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.