From: Charles Bailey <charles@hashpling.org>
To: Sebastian Schuberth <sschuberth@gmail.com>
Cc: git@vger.kernel.org, David Aguilar <davvid@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 0/3] Improvements to mergetool-lib
Date: Thu, 18 Nov 2010 11:27:57 +0000 [thread overview]
Message-ID: <4CE50DBC.3090409@hashpling.org> (raw)
In-Reply-To: <4CE50290.90600@gmail.com>
On 18/11/2010 10:40, Sebastian Schuberth wrote:
> This small series adds Beyond Compare 3 as a diff / merge tool
> and performs some minor improvements.
>
> Sebastian Schuberth (3):
> mergetool--lib: Sort tools alphabetically for easier lookup
> mergetool--lib: Add Beyond Compare 3 as a tool
> mergetool--lib: Add the proper executable name for ECMerge
>
> Documentation/git-difftool.txt | 4 +-
> Documentation/git-mergetool.txt | 4 +-
> Documentation/merge-config.txt | 8 +-
> contrib/completion/git-completion.bash | 2 +-
> git-gui/lib/mergetool.tcl | 101 +++++++------
> git-mergetool--lib.sh | 243 +++++++++++++++++---------------
> 6 files changed, 195 insertions(+), 167 deletions(-)
>
I'm not an ecmerge or Beyond Compare user. The reordering of tools makes
for a bit of a messy diff but I think it makes sense.
This series looks good to me. Has it been well tested?
Charles.
next prev parent reply other threads:[~2010-11-18 11:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-18 10:40 [PATCH 0/3] Improvements to mergetool-lib Sebastian Schuberth
2010-11-18 10:43 ` [PATCH 1/3] mergetool--lib: Sort tools alphabetically for easier lookup Sebastian Schuberth
2010-11-18 10:43 ` [PATCH 2/3] mergetool--lib: Add Beyond Compare 3 as a tool Sebastian Schuberth
2010-11-18 10:44 ` [PATCH 3/3] mergetool--lib: Add the proper executable name for ECMerge Sebastian Schuberth
2010-11-18 11:27 ` Charles Bailey [this message]
2010-11-18 12:22 ` [PATCH 0/3] Improvements to mergetool-lib Sebastian Schuberth
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=4CE50DBC.3090409@hashpling.org \
--to=charles@hashpling.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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 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).