There is a simple solution to this issue that worked for me. I merely started up Xcode and created an iOS playground project. Xcode asked me to enable developer mode on the Mac, which I did. I then closed Xcode, deleted the project and the filemerge error was no more.
Running Xcode version 6.2