From: Chris Packham <judge.packham@gmail.com>
To: Sebastian Schuberth <sschuberth@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
charles@hashpling.org,
Pat Thoyts <patthoyts@users.sourceforge.net>
Subject: Re: [PATCH 2/2 v2] mergetool--lib: Add Beyond Compare 3 as a tool
Date: Mon, 28 Feb 2011 19:15:07 +1300 [thread overview]
Message-ID: <4D6B3D6B.2010001@gmail.com> (raw)
In-Reply-To: <4D6A365E.4030904@gmail.com>
On 28/02/11 00:32, Sebastian Schuberth wrote:
> Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
> ---
> Documentation/git-difftool.txt | 2 +-
> Documentation/git-mergetool.txt | 2 +-
> Documentation/merge-config.txt | 2 +-
> contrib/completion/git-completion.bash | 2 +-
> git-gui/lib/mergetool.tcl | 7 +++++++
> git-mergetool--lib.sh | 22 ++++++++++++++++++++--
> 6 files changed, 31 insertions(+), 6 deletions(-)
Works for me.
Tested-by: Chris Packham <judge.packham@gmail.com>
next prev parent reply other threads:[~2011-02-28 6:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-27 11:28 [PATCH 0/2 v2] Adding Beyond Compare as a merge tool Sebastian Schuberth
2011-02-27 11:31 ` [PATCH 1/2 v2] mergetool--lib: Sort tools alphabetically for easier lookup Sebastian Schuberth
2011-02-27 11:32 ` [PATCH 2/2 v2] mergetool--lib: Add Beyond Compare 3 as a tool Sebastian Schuberth
2011-02-28 6:15 ` Chris Packham [this message]
2011-02-28 6:25 ` Sebastian Schuberth
2011-02-28 6:52 ` [PATCH 0/2 v2] Adding Beyond Compare as a merge tool Junio C Hamano
2011-02-28 7:02 ` Sebastian Schuberth
2011-03-02 0:28 ` Pat Thoyts
2011-03-02 4:26 ` 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=4D6B3D6B.2010001@gmail.com \
--to=judge.packham@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=patthoyts@users.sourceforge.net \
--cc=sschuberth@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.