From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 03 May 2009 14:30:30 GMT
Subject: Re: [PATCH] mergetool--lib: add support for araxis merge
Message-ID: <alpine.DEB.1.00.0905031629290.18521@pacific.mpi-cbg.de>
In-Reply-To: <1241313481-17923-1-git-send-email-davvid@gmail.com>

Hi,

On Sat, 2 May 2009, David Aguilar wrote:

> Araxis merge is now a built-in diff/merge tool.
> This adds araxis to git-completion and updates
> the documentation as well.
> 
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
> 
> This patch is a result of the discussion on the msysgit list:
> 
> http://groups.google.com/group/msysgit/browse_thread/thread/fa353fa2240594d7
> 
> 'compare' is the command-line utility that is provided
> on MacOS.  Users on other platforms may have to manually
> set their mergetool.araxis.path.

The only reason I did not merge that patch sent to msysgit@googlegroups 
was that I did not have _any_ confirmation that it works.

Do you have any?  As Araxis is not free software, I refuse to touch it.

Ciao,
Dscho