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

Re: Please pull mergetool.git

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Jun 11, 2007, 01:55 UTC
Message-ID
<46a038f90706101855g639656f3qe80adeeb3a7d6dc2@mail.gmail.com>
In-Reply-To
<7vabv74838.fsf@assigned-by-dhcp.cox.net>
On 6/11/07, Junio C Hamano <gitster@pobox.com> wrote:
Show 5 quoted lines
> Brian Gernhardt <benji@silverinsanity.com> writes:
> > Actually, opendiff (as FileMerge.app) is available under OS X, where
> > $DISPLAY is not set.
>
> Heh, a graphical environment that does not use DISPLAY...

FWIW, it depends on whether you are using xterm (DISPLAY is set) or Terminal.app (DISPLAY may not be set). In any case FileMerge.app will ignore DISPLAY.

cheers,
m
Previous: Junio C HamanoNext: Theodore Tso
Message 6 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.