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

Re: Please pull mergetool.git

From
Brian Gernhardt <benji@silverinsanity.com>
Date
Jun 10, 2007, 23:29 UTC
Message-ID
<26568045-F443-415E-A250-29C7DD3998A9@silverinsanity.com>
In-Reply-To
<7v1wgj8tzy.fsf@assigned-by-dhcp.cox.net>
On Jun 10, 2007, at 3:55 PM, Junio C Hamano wrote:
Show 5 quoted lines
> I do not see problems in the mergetool part, other than that I
> mildly suspect that opendiff -- actually FileMerge -- might want
> to be in the test -n "$DISPLAY" section, but that is inherited
> from the previous iteration so in that sense leaving outside is
> a sane thing to do.

Actually, opendiff (as FileMerge.app) is available under OS X, where $DISPLAY is not set.

~~ Brian
Previous: Theodore TsoNext: Junio C Hamano
Message 4 of 7 in “Please pull mergetool.git”
  1. Theodore Ts'oJun 10, 2007
  2. Junio C HamanoJun 10, 2007
  3. Theodore TsoJun 10, 2007
  4. Brian GernhardtJun 10, 2007
  5. Junio C HamanoJun 11, 2007
  6. Martin LanghoffJun 11, 2007
  7. Theodore TsoJun 11, 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.