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

Re: [PATCH] mergetool: make Apple's FileMerge available as a merge_tool

From
Steffen Prohaska <prohaska@zib.de>
Date
Jun 17, 2007, 16:13 UTC
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:
Show 5 quoted lines
> 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
Previous: Steffen ProhaskaNext: Theodore Tso
Message 2 of 6 in “mergetool: make Apple's FileMerge available as a merge_tool”
  1. mergetool: make Apple's FileMerge available as a merge_toolSteffen Prohaska, Jun 17, 2007
  2. Steffen ProhaskaJun 17, 2007
  3. Theodore TsoJun 17, 2007
  4. Steffen ProhaskaJun 17, 2007
  5. Scott LambJun 18, 2007
  6. Theodore TsoJun 18, 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.