From: Wincent Colaiuta <win@wincent.com>
Date: Mon, 25 May 2009 09:31:30 GMT
Subject: Re: Araxis in mergetool, was Re: What's cooking in git.git (May 2009, #03; Mon, 25)
Message-ID: <695E5CDA-CB26-44C9-B8B0-8215E16728F2@wincent.com>
In-Reply-To: <alpine.DEB.1.00.0905251050050.4288@intel-tinevez-2-302>

El 25/5/2009, a las 10:54, Johannes Schindelin escribió:

> 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

No, to my knowledge Apple FileMerge isn't open source either and it's  
supported.

Cheers,
Wincent