From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 25 May 2009 08:54:43 GMT
Subject: Araxis in mergetool, was Re: What's cooking in git.git (May 2009, #03; Mon, 25)
Message-ID: <alpine.DEB.1.00.0905251050050.4288@intel-tinevez-2-302>
In-Reply-To: <7vd49xy42b.fsf@alter.siamese.dyndns.org>

Hi,

On Mon, 25 May 2009, Junio C Hamano wrote:

> * da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit
>  + mergetool--lib: add support for araxis merge
> 
> I admit that I feel certain distaste in supporting a closed tool, but we
> already make things bearable for people on Windows; Araxis is no worse,
> right?

Well, I think it is the first closed-source tool that we support, and I 
would feel less unhappy if somebody reported back that she tested it and 
it works fine.

For the future, it might be better if mergetool could be configured using 
/etc/gitconfig to call the merge helper properly.  Then we would not need 
to clutter git.git with properietary stuff, but could just have the 
Windows-specific handling in Git for Windows.

Ciao,
Dscho