A Unity ID allows you to buy and/or subscribe to Unity products and services, shop in the Asset Store and participate in the Unity community.
Separate names with a comma.
Thanks for the info, WinMerge did the trick! It would be nice if P4Merge didn't appear in the options if it's disabled! :)
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....