WinMerge

WinMerge is an open-source file comparer that displays the differences between two files in a visual text format that is easy to understand. Use it to quickly determine what has changed between project versions and then merge those changes between versions. WinMerge features a flexible editor with syntax highlighting, line numbers, word-wrap, and regular expressions in addition to full support for comparing folders and 7-Zip archives.