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

Re: [PATCH] Teach git-mergetool about Apple's opendiff/FileMerge

From
MRMarco Roeland <marco.roeland@xs4all.nl>
Date
Mar 23, 2007, 18:42 UTC
Message-ID
<20070323184235.GA11195@fiberbit.xs4all.nl>
In-Reply-To
<20070323141519.GA19649@thunk.org>
On Friday March 23rd 2007 at 10:15 Theodore Tso wrote:
> I won't have access to my MacOS X machine until I get back home, so I
> won't be able to try out your patch until early next week.  Is
> opendiff in the standard MacOS release, or do I have to do something
> special to get it?

The man page says: "opendiff and FileMerge are installed as part of the Mac OS X Developer Tools" and it looks quite nice!

-- 
Marco Roeland
Previous: Theodore TsoNext: Theodore Tso
Message 6 of 7 in “Teach git-mergetool about Apple's opendiff/FileMerge”
  1. Teach git-mergetool about Apple's opendiff/FileMergeArjen Laarhoven, Mar 22, 2007
  2. Junio C HamanoMar 23, 2007
  3. Steven GrimmMar 23, 2007
  4. Arjen LaarhovenMar 23, 2007
  5. Theodore TsoMar 23, 2007
  6. Marco RoelandMar 23, 2007
  7. Theodore TsoMar 29, 2007

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.