From: Steffen Prohaska <prohaska@zib.de>
Date: Sun, 17 Jun 2007 16:13:11 GMT
Subject: Re: [PATCH] mergetool: make Apple's FileMerge available as a merge_tool
Message-ID: <B12626B9-766E-4EA4-888F-B3E2DA889D15@zib.de>
In-Reply-To: <11820959413590-git-send-email-prohaska@zib.de>


On Jun 17, 2007, at 5:59 PM, Steffen Prohaska wrote:

> Apple's developer tools include the application FileMerge,
> which supports graphical three way merges with ancestor.
> This patch makes the tool available through git-mergetool.
>
> FileMerge is assumed to be installed at its default location.

Hmm, now I found out that opendiff, which was already available
as an option, actually launches FileMerge.

I wasn't aware of this fact. git-mergetool proposed to use vimdiff
although I had preferred the graphical application FileMerge, which
would have been launched by opendiff.

Don't know if my patch makes any sense. Probably a note in the
documentation that opendiff launches the GUI would be nice.

	Steffen