WinMerge 2.14.0 + (3-way merge, image compare/merge) +-jp-138

virustotal.com's results:

32bit installer: https://www.virustotal.com/en/file/90b60332dde734a09db369695959ddbcd0efcf5f7479960d85722d9302cf449c/analysis/1503944235/
64bit installer: https://www.virustotal.com/en/file/4def1a5f587f4d112f643fc3687eb4101c390d486f2110482f735f57928ca6fa/analysis/1503944245/
32bit exe zip: https://www.virustotal.com/en/file/69410045f209f973a6b4da6d744566247c026bcf3e62baa3c6b74f6713946401/analysis/1503944257/
64bit exe zip: https://www.virustotal.com/en/file/3f71e2df98508f42bca8e0a0a86f3e7ad73c97690d005f20c6cf6eaf37197f28/analysis/1503944271/