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

virustotal.com's results

32bit installer: https://www.virustotal.com/en/file/6eec0a9490d640b2eb1646e3aec7b930e34dd1ef032bb940fd830a3b33a0417b/analysis/1486297552/
64bit installer: https://www.virustotal.com/en/file/7108f9d746835127c3aeaab37f0828604aef94e0478ad3d63be8a8cd60996b70/analysis/1486297635/
32bit exe zip: https://www.virustotal.com/en/file/b48f5f5d168371e96c4e1cb9ec2e34a0b6ef30ef0ede423d567d975f03144cc3/analysis/1486298638/
64bit exe zip: https://www.virustotal.com/en/file/511761edea212e7772ab187a016ba93805fe2f9f8ede658780a732129ec22b1f/analysis/1486298774/