Mac OS X 10.10 merge tool git bugs

Question

When I am attempting to use git mergetool I get the following errors.

Normal merge conflict for 'application/language/dutch/config_lang.php':
  {local}: modified file
  {remote}: modified file
Hit return to start merge resolution tool (opendiff): 
2014-10-16 16:30:02.996 FileMerge[42541:5140761] Failed to connect (delegate) outlet from (DiffController) to (DiffController): missing setter or instance variable
2014-10-16 16:30:02.997 FileMerge[42541:5140761] Failed to connect (mainPrefPane) outlet from (DiffController) to (NSBox): missing setter or instance variable
2014-10-16 16:30:03.071 FileMerge[42541:5140761] Unable to load platform at path /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform
2014-10-16 16:30:03.072 FileMerge[42541:5140761] Unable to load platform at path /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform

What can I do to fix this? The tool launches but I cannot continue after the first file.

NOTE: This error is intermittent, but happens most of the time.

Answer 1

cd /Applications/Xcode.app/Contents/Developer/Platforms

plutil -convert xml1 iPhoneOS.platform/Info.plist

plutil -convert xml1 iPhoneSimulator.platform/Info.plist

This fixes the 2nd set of warnings. This has been an issue since 10.8, but apple ignores my bug report :)