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

Re: Araxis in mergetool, was Re: What's cooking in git.git (May 2009, #03; Mon, 25)

From
Michael Wookey <michaelwookey@gmail.com>
Date
May 25, 2009, 10:05 UTC
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>:
Show 14 quoted lines
> 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.
Previous: David AguilarNext: Junio C Hamano
Message 5 of 6 in “What's cooking in git.git (May 2009, #03; Mon, 25)”
  1. Junio C HamanoMay 25, 2009
  2. Araxis in mergetool, was Re: What's cooking in git.git (May 2009, #03; Mon, 25)Johannes Schindelin, May 25, 2009
  3. Wincent ColaiutaMay 25, 2009
  4. David AguilarMay 25, 2009
  5. Michael WookeyMay 25, 2009
  6. Junio C HamanoMay 25, 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.