Ohhh, it was the toolchain, of course that setting would be imported/shared by the new Xcode version. Thanks for the suggestion :)

Does anyone have a non-workaround update to this (Quinn perhaps?) It must be 6 years this has been the case now, and FileMerge is fairly important especially when dealing with those pesky xcodeproj merge conflicts ;)