Publisher URL: http://winmerge.org/
All software products from Thingamahoochie Software:
WinMerge 2.8.4
WinMerge is a tool for visual difference display and merging, for both files and directories. Unicode support. Flexible syntax coloring editor. Windows Shell integration. Regexp filtering. Side-by-side line diff. Highlights differences inside lines.