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

virustotal.com's results:

32bit installer: https://www.virustotal.com/en/file/c06aa44201cec9c406997c39382b341b94fff3eb496a1c410ebd6609a46f8d4b/analysis/1494799597/
64bit installer: https://www.virustotal.com/en/file/57b069581c2045f067c39925e5ae8167f47e9b3099c30858fbc73ddda6951001/analysis/1494799607/
32bit exe zip: https://www.virustotal.com/en/file/e9d06bdd71dd951712f5b60363b7736f99a14d20d783fffe1927c0fa607fedde/analysis/1494799622/
64bit exe zip: https://www.virustotal.com/en/file/d4e3c2e963b6155db2c2d9d78a9706f9a0a965779ef96e64f5019f6bdf1607b4/analysis/1494799640/