Re: Please pull mergetool.git

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 11, 2007, 01:02 UTC
Message-ID: <7vabv74838.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <26568045-F443-415E-A250-29C7DD3998A9@silverinsanity.com>

Brian Gernhardt <benji@silverinsanity.com> writes:

Show 10 quoted lines

> On Jun 10, 2007, at 3:55 PM, Junio C Hamano wrote:
>
>> 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.

Heh, a graphical environment that does not use DISPLAY...

Thanks.