winmerge
winmerge copied to clipboard
Upgrade from 2.14 issue
If you upgrade from 2.14 to 2.16.36 x64, it does not remove the old 2.14 version. The context menu gets corrupted.
The latest 64bit version should uninstall/upgrade old versions, even if they are 32bit.
I think you can unregister the old context menu in the Shell Integration category of the Options window as shown below.