git mergetool doesnt list opendiff as an option

[GoogleCodeExporter]

What steps will reproduce the problem?
1.  run "git mergetool" -> by default on 10.8 you wont see 'opendiff' in the 
list
2.
3.

What is the expected output? What do you see instead?
- opendiff should be in the list

What version of the product are you using? On what operating system?
- osx 10.8, git 1.7.11.3, 1.7.9.6 (Apple Git-31.1)

Please provide any additional information below.
looking at the code, it appears this snippet in git-mergetool--lib:
        if test -n "$DISPLAY"
        then
                if test -n "$GNOME_DESKTOP_SESSION_ID"
                then
                        tools="meld opendiff kdiff3 tkdiff xxdiff $tools"
                else
                        tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
                fi
                tools="$tools gvimdiff diffuse ecmerge p4merge araxis bc3"
        fi

is to blame. under 10.8 it appears that $DISPLAY isn't set, and therefore this 
entire block of code is ignored.  Likely I'm thinking that the test -n display 
should be ignored on osx and this section run anyways.

Original issue reported on code.google.com by ryano...@gmail.com on 17 Aug 2012 at 8:28

[GoogleCodeExporter]

I'm having the same issue and I can't find a solution.
I've tried all the resources, as far as reinstalling the OS, but opendiff does 
not show up...
any luck anyone?

Original comment by guime.sp...@gmail.com on 7 Nov 2012 at 11:08

[GoogleCodeExporter]

You were absolutely right!
After a lot of research, I discovered that the variable $DISPLAY is indeed not 
set in Mountain Lion.

The reason is that Mountain Lion doesn't install X11, and for some reason only 
X11 was responsible for setting this.
So I installed an X11 adapter, suggested by Apple itself, and then everything 
worked again.

Original comment by guime.sp...@gmail.com on 8 Nov 2012 at 7:37

[GoogleCodeExporter]

Original comment by timchar...@gmail.com on 13 Dec 2012 at 6:14

• Changed state: WontFix