Brian Gernhardt [off-list ref] writes:
On Jun 10, 2007, at 3:55 PM, Junio C Hamano wrote:
quoted
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.
On 6/11/07, Junio C Hamano [off-list ref] wrote:
Brian Gernhardt [off-list ref] writes:
quoted
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
On Mon, Jun 11, 2007 at 01:55:25PM +1200, Martin Langhoff wrote:
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.
Is there a reliable way on MacOS to determine whether the user is
sitting in front of the terminal, as opposed to logged into the MacOS
box remotely? Ideally we would only try opendiff/FileMerge.app if we
new that the user is indeed sitting in front of the graphical display.
- Ted