From: David Aguilar <davvid@gmail•com>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: gitster@pobox•com, snowcoder@gmail•com, spearce@spearce•org,
markus.heidelberg@web•de, git@vger•kernel.org,
charles@hashpling•org
Subject: Re: [PATCH] mergetool--lib: add support for araxis merge
Date: Sun, 3 May 2009 11:18:24 -0700 [thread overview]
Message-ID: <20090503181824.GA50640@gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0905031629290.18521@pacific.mpi-cbg.de>
On 0, Johannes Schindelin <Johannes.Schindelin@gmx•de> wrote:
> 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
I tested it (but not on windows). It works.
I have the same reservations about non-free software,
but at least they mention git on their homepage
(even if it's only in their documentation).
--
David
next prev parent reply other threads:[~2009-05-03 18:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-03 1:18 [PATCH] mergetool--lib: add support for araxis merge David Aguilar
2009-05-03 6:54 ` Markus Heidelberg
2009-05-03 18:20 ` David Aguilar
2009-05-04 0:09 ` David Aguilar
2009-05-09 20:56 ` Markus Heidelberg
2009-05-03 14:30 ` Johannes Schindelin
2009-05-03 18:18 ` David Aguilar [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-05-18 3:18 David Aguilar
2009-05-23 14:29 ` Markus Heidelberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090503181824.GA50640@gmail.com \
--to=davvid@gmail$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=charles@hashpling$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=markus.heidelberg@web$(echo .)de \
--cc=snowcoder@gmail$(echo .)com \
--cc=spearce@spearce$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox