From: Junio C Hamano Date: Mon, 25 May 2009 22:23:52 GMT Subject: Re: Araxis in mergetool, was Re: What's cooking in git.git (May 2009, #03; Mon, 25) Message-ID: <7viqjovn2f.fsf@alter.siamese.dyndns.org> In-Reply-To: Johannes Schindelin writes: > 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,... I do not think Windows and/or MacOSX were open-source tools ;-)