I just updated to Unity 2017.1.0p4, and when I try to diff files, I'm getting this message: "The configured Diff/Merge tool is not supported. Check your Unity preferences." P4Merge is selected in External Tools (currently the only diff/merge tool). It was working for me recently under Unity 5.6. Is this a known problem?