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

virustotal.com's results:

32bit installer: https://www.virustotal.com/en/file/01c6ea69cd2a487a2e5b0252f5f8698ad0f7c20d1b8ea54d1920dce3c5a61fb5/analysis/1495381742/
64bit installer: https://www.virustotal.com/en/file/bf48d1c3e33238c4bfb06ba2f8c7b64b519cc7083abd26c3751926794cd72bba/analysis/1495381754/
32bit exe zip: https://www.virustotal.com/en/file/0883ab4e89f16f40add640b141806c4a4a292e133428abd676a53d48e033033b/analysis/1495381766/
64bit exe zip: https://www.virustotal.com/en/file/e4b53289cc6e1c931dc3122f51183ce77832281658c10b123f8d8bd95ff3e03f/analysis/1495381781/