git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] mergetool--lib: add support for araxis merge

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
May 3, 2009, 14:30 UTC
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:
Show 14 quoted lines
> 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

Previous: Markus HeidelbergNext: David Aguilar
Message 6 of 7 in “mergetool--lib: add support for araxis merge”
  1. mergetool--lib: add support for araxis mergeDavid Aguilar, May 3, 2009
  2. Markus HeidelbergMay 3, 2009
  3. David AguilarMay 3, 2009
  4. David AguilarMay 4, 2009
  5. Markus HeidelbergMay 9, 2009
  6. Johannes SchindelinMay 3, 2009
  7. David AguilarMay 3, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.