From: Theodore Tso <tytso@mit.edu>
To: Steffen Prohaska <prohaska@zib.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] mergetool: add support for ECMerge
Date: Mon, 8 Oct 2007 17:44:51 -0400 [thread overview]
Message-ID: <20071008214451.GB31713@thunk.org> (raw)
In-Reply-To: <11918785611059-git-send-email-prohaska@zib.de>
On Mon, Oct 08, 2007 at 11:22:41PM +0200, Steffen Prohaska wrote:
> Add support for ECMerge available from
> http://www.elliecomputing.com/Products/merge_overview.asp
Hmm. A propietary merge tool. It's not that much code, so I guess....
I note though that it claims on the web page that they are integrated
with "most famous SCM's", but they don't include git. If we add this
support, are they going to change their web page? :-)
Also, ECmerge is supported on Linux, Solaris, MacOS X, and Windows.
Which platforms have you tested on? My guess is that if it works on
Linux, it'll probably work on Solaris and MacOS, but is it a fair
guess you haven't tested under Windows? Not that most Windows systems
are going to be able to use git-mergetool since it's a bash script,
unless they are using Cygwin or some such.
- Ted
next prev parent reply other threads:[~2007-10-08 21:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-08 21:22 [PATCH] mergetool: support absolute paths to tools by git config merge.<tool>path Steffen Prohaska
2007-10-08 21:22 ` [PATCH] mergetool: add support for ECMerge Steffen Prohaska
2007-10-08 21:44 ` Theodore Tso [this message]
2007-10-09 6:14 ` Steffen Prohaska
2007-10-09 12:37 ` Johannes Schindelin
2007-10-09 12:49 ` Steffen Prohaska
2007-10-09 13:03 ` Alan Hadsell
2007-10-09 13:17 ` Steffen Prohaska
2007-10-09 14:21 ` Alan Hadsell
2007-10-08 21:57 ` [PATCH] mergetool: support absolute paths to tools by git config merge.<tool>path Theodore Tso
2007-10-08 22:01 ` Theodore Tso
2007-10-09 6:30 ` Steffen Prohaska
2007-10-08 22:00 ` Frank Lichtenheld
2007-10-09 6:42 ` Steffen Prohaska
2007-10-09 12:35 ` Johannes Schindelin
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=20071008214451.GB31713@thunk.org \
--to=tytso@mit.edu \
--cc=git@vger.kernel.org \
--cc=prohaska@zib.de \
/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).