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

From: Charles Bailey <charles@hashpling.org>
Date: Dec 9, 2009, 22:34 UTC
Message-ID: <20091209223409.GA32744@hashpling.org>
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:

Show 9 quoted lines

> 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.