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

virustotal.com's results

32bit installer: https://www.virustotal.com/en/file/09c4f7d569104422bb6348bdc0f20eb54c78d039a1a0db11471d5b063ec19918/analysis/1480858516/
64bit installer: https://www.virustotal.com/en/file/61612e2cb41aada02ca9f8cefa7a2886aec03506aaeb97904c036dafc0b705d3/analysis/1480858526/
32bit exe zip: https://www.virustotal.com/en/file/cf0039bb36d7fc1914c366fab9337f3fdc95c936e91d204b5e8959e5114a37c3/analysis/1480859222/
64bit exe zip: https://www.virustotal.com/en/file/ea675a94135ca5e1b7a3fe737356067f980ba89bfb842caee88e6a9e48a93387/analysis/1480859226/