When using filemerge to solve HG conflict, I got the following error
filemerge
HG
FileMerge[18002:707] Unable to load platform at p
I tried converting all *.platform/Info.plist from binary to xml1 and it fixed the problem. Strange ...
*.platform/Info.plist
binary
xml1