WinMerge

WinMerge is a tool for visual difference display and merging, for both files and directories. Read more about WinMerge
WinMerge WinMerge screenshots
WinMerge screenshot 1
WinMerge
WinMerge screenshot 2
WinMerge 2.14.0
WinMerge screenshot 3
WinMerge 2.14.0