Re: [PATCH] mergetool: make Apple's FileMerge available as a merge_tool

On Mon, Jun 18, 2007 at 02:39:08AM -0700, Scott Lamb wrote:

I propose a simpler test:

    if [ -n "$TERM_PROGRAM" ]; then
        echo local
    else
        echo remote
    fi

This environment variable seems to be set by Terminal.app and even two
alternatives I just tried (iTerm.app and GLterm.app). It's not
transmitted across ssh unless you stick an AcceptEnv in sshd_config.

Thanks, that's just what I was looking for!

						- Ted