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

virustotal.com's results

32bit installer: https://www.virustotal.com/en/file/800c3cc348e353eb04fd7b66586bff8877eab36ceaf6d204bdb001a0188f8ed1/analysis/1480516170/
64bit installer: https://www.virustotal.com/en/file/fcc1e20aa35ed9aa5eecbdc59919f003cc01cc0e798e6ab1718171f62755ce64/analysis/1480516178/
32bit exe zip: https://www.virustotal.com/en/file/371eb523fe6f242c8036d2cff3f5c1dc13d7efeb09c0f9dab87452f008aefb61/analysis/1480517141/
64bit exe zip: https://www.virustotal.com/en/file/4bca358f9b968741e16bad0f27c267bee04f90f5adfd957e4a1fe27d4d46a265/analysis/1480517145/