From: Marco Roeland Date: Fri, 23 Mar 2007 18:42:35 GMT Subject: Re: [PATCH] Teach git-mergetool about Apple's opendiff/FileMerge 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