I have a set of binary configuration files with three versions each -- an original, and two differently-modified versions of each file. I need to be able to see the differences
I was recently introduced to p4merge, which appears to also support binary files.
It takes 3 files as input: The original and two derivatives. It shows them side-by-side, with a fourth window that shows the merged file, with editing capabilities and conflict resolution.
I just used this to merge two branches of a large codebase, and it was extremely convenient.
Now, I haven't used it to merge binary files, but it does support diffing pictures, so I'd be surprised if binaries weren't supported.