From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Mon, 11 Jun 2007 01:55:25 GMT
Subject: Re: Please pull mergetool.git
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:
> 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