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 git diff from the command line, I get this message:
2011-02-18 13:58:55.532 opendiff[27959:60f] exception raised trying to run FileMerge: launch path not accessible
2011-02-18 13:58:55.535 opendiff[27959:60f] Couldn't launch FileMerge
external diff died, stopping at source/some_file.m.
What's going on? This has worked for many months, but stopped working recently.
So AFTER I deleted the beta developer folder to try and solve this (couldn't get the fix to work with merge tool) I stumbled upon this in the command line:
Turns out you can set the developer path you need it to use:
Looks like installing the beta had automatically set that path to beta. To fix it, run this:
That fixed it for me.
Update
Ying's comment below was important enough to include in the answer. From Xcode 4.3 on, the location of the folder has changed to inside the application package: