From: Sebastian Schuberth <sschuberth@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: git@vger.kernel.org, David Aguilar <davvid@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 3/3] mergetool--lib: Add the proper executable name for ECMerge
Date: Thu, 18 Nov 2010 11:44:31 +0100 [thread overview]
Message-ID: <4CE5038F.2040400@gmail.com> (raw)
In-Reply-To: <4CE50290.90600@gmail.com>
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
git-mergetool--lib.sh | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 47049a6..58398bd 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -16,6 +16,9 @@ translate_merge_tool_path () {
bc3)
echo BCompare
;;
+ ecmerge)
+ echo guimerge
+ ;;
emerge)
echo emacs
;;
--
1.7.3.2.msysgit.11
next prev parent reply other threads:[~2010-11-18 10:44 UTC|newest]
Thread overview: 10+ 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 ` Sebastian Schuberth [this message]
2010-11-18 11:27 ` [PATCH 0/3] Improvements to mergetool-lib Charles Bailey
2010-11-18 12:22 ` Sebastian Schuberth
-- strict thread matches above, loose matches on Subject: below --
2011-02-26 10:49 [PATCH 0/3] Adding Beyond Compare as a merge tool, was: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23) Sebastian Schuberth
2011-02-26 10:53 ` [PATCH 3/3] mergetool--lib: Add the proper executable name for ECMerge Sebastian Schuberth
2011-02-27 5:50 ` Chris Packham
2011-02-27 10:37 ` Sebastian Schuberth
2011-02-27 19:25 ` Chris Packham
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=4CE5038F.2040400@gmail.com \
--to=sschuberth@gmail.com \
--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).