Tool for 3-Way Binary (Hex) File Comparison?

后端 未结 5 1653
温柔的废话
温柔的废话 2021-02-10 11:05

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

5条回答
  •  半阙折子戏
    2021-02-10 11:45

    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.

    p4merge example

    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.

提交回复
热议问题