Re: [PATCH] mergetool: add support for ECMerge
- From
Theodore Tso <tytso@mit.edu>
- Date
- Oct 8, 2007, 21:44 UTC
- Message-ID
- <20071008214451.GB31713@thunk.org>
- 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