From: Charles Bailey <charles@hashpling.org>
To: Jay Soffian <jaysoffian@gmail.com>
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 22:34:09 +0000 [thread overview]
Message-ID: <20091209223409.GA32744@hashpling.org> (raw)
In-Reply-To: <1260302477-49412-1-git-send-email-jaysoffian@gmail.com>
On Tue, Dec 08, 2009 at 12:01:17PM -0800, Jay Soffian wrote:
> Add SourceGear DiffMerge to the set of built-in diff/merge tools, and update
> bash completion and documentation.
> ---
> Documentation/git-difftool.txt | 2 +-
> Documentation/git-mergetool.txt | 2 +-
> Documentation/merge-config.txt | 4 ++--
> contrib/completion/git-completion.bash | 2 +-
> git-mergetool--lib.sh | 22 ++++++++++++++++++++--
> 5 files changed, 25 insertions(+), 7 deletions(-)
I'm not a diffmerge user but the patch looks fine to me.
Is diffmerge free but not Free?
Any reason for holding back on sign-off?
Charles.
next prev parent reply other threads:[~2009-12-09 22:45 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 [this message]
2009-12-09 23:14 ` Jay Soffian
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=20091209223409.GA32744@hashpling.org \
--to=charles@hashpling.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaysoffian@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.