From: Jay Soffian <jaysoffian@gmail.com>
To: Charles Bailey <charles@hashpling.org>
Cc: git@vger.kernel.org, David Aguilar <davvid@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] mergetool--lib: add diffmerge as a pre-configured mergetool option
Date: Wed, 9 Dec 2009 15:14:23 -0800 [thread overview]
Message-ID: <76718490912091514l16f6dd71g3f644ccf4ef5835c@mail.gmail.com> (raw)
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.
next prev parent reply other threads:[~2009-12-09 23:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-08 20:01 [PATCH] mergetool--lib: add diffmerge as a pre-configured mergetool option Jay Soffian
2009-12-09 22:34 ` Charles Bailey
2009-12-09 23:14 ` Jay Soffian [this message]
2009-12-10 0:08 ` Junio C Hamano
2009-12-10 0:16 ` Jay Soffian
2011-08-16 10:09 ` David Aguilar
2011-08-16 17:43 ` Junio C Hamano
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=76718490912091514l16f6dd71g3f644ccf4ef5835c@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=charles@hashpling.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).