I'm using Perforce and its default merge tool p4merge. On integration I have several conflicts in a vcproj I wish to resolve.
But it seems p4merge tries to somehow interpret the file's contents and only says "Image files can not be merged" then exits. This way I cannot resolve the conflict and cannot even get get a diff.
It's either a very new unreported bug, or have a very trivial workaround, because Google search shows absolutely nothing related about it (except a Twitter post).
Does anybody knows a workaround?
(I'm using the Linux version of Perforce.)
UPDATE:
The Perforce file type is 'text'. So they are not binary.
I was having this error too (using tools that say "2012 June 06" in the about box). I just downloaded the latest tools from the Perforce website (dated "2012 December 17"), and the bug went away. Try downloading the latest tools!