From: Michael Wookey <michaelwookey@gmail.com>
Date: Mon, 25 May 2009 10:05:24 GMT
Subject: Re: Araxis in mergetool, was Re: What's cooking in git.git (May 2009, #03; Mon, 25)
Message-ID: <d2e97e800905250305l3f50d655y8a53300e4131ef16@mail.gmail.com>
In-Reply-To: <alpine.DEB.1.00.0905251050050.4288@intel-tinevez-2-302>

2009/5/25 Johannes Schindelin <Johannes.Schindelin@gmx.de>:
> 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.

The mergetool support appears to work well using Araxis Merge on Mac OSX.