On Oct 8, 2007, at 11:44 PM, Theodore Tso wrote:

quoted text
> 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?  :-)

You may even apply for a free (as beer) license if you contribute
to open source projects:

http://www.elliecomputing.com/Community/opensource.asp

I didn't try this, so I can't say how this works in practice.

quoted text
> Also, ECmerge is supported on Linux, Solaris, MacOS X, and Windows.
> Which platforms have you tested on?

Windows. Haven't tested Unix systems yet.

quoted text
> 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.

I work on the msysgit project and I'd like to have mergetool
available before I advertise git on Windows. It makes merging
so much easier ;)

	Steffen


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html