IDEA-21298 has been an issue for years, but no fixes in sight.
What do folks do when they use the cvs merge (-j -j) feature and it picks up binary file changes.
The only solution I have, is to check for binary (-kb) files, and hand copy them from the branch
I'm merging from.
I'm hoping there is some other way, as I'd assume there would be a lot more pressure to fix the bug otherwise.