git diff with opendiff gives “Couldn't launch FileMerge” error

Question

I have git configured to use ~/bin/opendiff-git.sh as my external diff tool. That script looks like this:

opendiff $2 $5

When I try and do a gi

Answer 1

If you have two SDKs installed, and the latest (presumably beta) version doesn't have the System Tools installed, some tools like opendiff can break. You can only have one set of System Tools installed at a time, so you have to choose which SDK/installation has it. I fixed this problem by using the path of opendiff that is in the Developer folder that had the system tools installed.

In my case, I have the following Xcode installations:

Current stable release (with System Tools installed)

/Developer

Latest beta (without System Tools installed)

/Developer (iOS SDK XXX beta)

My ~/bin/opendiff-git.sh script now looks like this:

"/Developer/usr/bin/opendiff" $2 $5