From: Jay Soffian <jaysoffian@gmail.com>
Date: Wed, 09 Dec 2009 23:14:23 GMT
Subject: Re: [PATCH] mergetool--lib: add diffmerge as a pre-configured mergetool option
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.