From: "Martin Langhoff" <martin.langhoff@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Brian Gernhardt" <benji@silverinsanity.com>,
"Theodore Ts'o" <tytso@mit.edu>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: Please pull mergetool.git
Date: Mon, 11 Jun 2007 13:55:25 +1200 [thread overview]
Message-ID: <46a038f90706101855g639656f3qe80adeeb3a7d6dc2@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2007-06-11 1:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-10 16:03 Please pull mergetool.git Theodore Ts'o
2007-06-10 19:55 ` Junio C Hamano
2007-06-10 21:31 ` Theodore Tso
2007-06-10 23:29 ` Brian Gernhardt
2007-06-11 1:02 ` Junio C Hamano
2007-06-11 1:55 ` Martin Langhoff [this message]
2007-06-11 13:31 ` Theodore Tso
-- strict thread matches above, loose matches on Subject: below --
2007-09-29 14:47 Theodore Ts'o
2007-09-29 22:43 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46a038f90706101855g639656f3qe80adeeb3a7d6dc2@mail.gmail.com \
--to=martin.langhoff@gmail.com \
--cc=benji@silverinsanity.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).