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

virustotal.com's results:

32bit installer: https://www.virustotal.com/en/file/9ae5b63af032529e02f564a9ba84612cbec5b4ecafdca08b56811ddc4af57833/analysis/1504106409/
64bit installer: https://www.virustotal.com/en/file/fa8f8836a678b108b4fb69e6d8301c847683860a378684ee72be31154a5aaf79/analysis/1504106424/
32bit exe zip: https://www.virustotal.com/en/file/826ed441f88ea3c8713b58e2a5f30d331aaaedf4c85596f0cafdc6eabfb1873b/analysis/1504106439/
64bit exe zip: https://www.virustotal.com/en/file/90ebb6e8db08c42730868f1ac11d1446a08b59b50e84d17e01bac30d85fcbc8b/analysis/1504106455/