From: Chris Packham <judge.packham@gmail.com>
To: Sebastian Schuberth <sschuberth@gmail.com>
Cc: git@vger.kernel.org, charles@hashpling.org
Subject: Re: [PATCH 3/3] mergetool--lib: Add the proper executable name for ECMerge
Date: Sun, 27 Feb 2011 18:50:32 +1300 [thread overview]
Message-ID: <4D69E628.5040007@gmail.com> (raw)
In-Reply-To: <4D68DBB0.2020909@gmail.com>
On 26/02/11 23:53, Sebastian Schuberth wrote:
> 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 3ac6231..95da00b 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
> ;;
I think this is another case of linux/windows versions of the
application having different executable names.
chrisp@laptop:~> tar -tf Download/ecmerge-2.3.123.linux.x86.tbz
/usr/local/bin/ecmerge
/opt/elliecomputing/ecmerge/guimerge
/opt/elliecomputing/ecmerge/guimerge.exe
next prev parent reply other threads:[~2011-02-27 5:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
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:51 ` [PATCH 1/3] mergetool--lib: Sort tools alphabetically for easier lookup Sebastian Schuberth
2011-02-26 10:52 ` [PATCH 2/3] mergetool--lib: Add Beyond Compare 3 as a tool 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 [this message]
2011-02-27 10:37 ` Sebastian Schuberth
2011-02-27 19:25 ` Chris Packham
2011-02-27 9:12 ` [PATCH 0/3] Adding Beyond Compare as a merge tool, was: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23) Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2010-11-18 10:40 [PATCH 0/3] Improvements to mergetool-lib Sebastian Schuberth
2010-11-18 10:44 ` [PATCH 3/3] mergetool--lib: Add the proper executable name for ECMerge 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=4D69E628.5040007@gmail.com \
--to=judge.packham@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--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.