From: Brian Gernhardt <benji@silverinsanity.com>
Date: Sun, 10 Jun 2007 23:29:51 GMT
Subject: Re: Please pull mergetool.git
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:

> 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