This week I tried an unoffical winmerge build http://winmerge.org/downloads/?lang=en (other versions). This one "[b]WinMerge 2.14.0 + 3-way merge, image compare/merge[/b]" was the best for me. I use the _WinMerge-2.14.0-jp-128-x64-Setup.exe.zip_. It is much better than the old winmerge.
-- <http://forum.pspad.com/read.php?2,64632,68032> PSPad freeware editor http://www.pspad.com
