WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.

Features:

• Visual differencing and merging of text files
• Flexible editor with syntax highlighting
• Handles DOS, UNIX and MAC text file formats
• Unicode support
• Difference pane shows current difference in two vertical panes
• Location pane shows map of files compared
• In-line word difference visualisation
• File filters in directory diff
• Moved lines detection in file compare
• Shell Integration
• Rudimentary Visual SourceSafe and Rational ClearCase integration
• Archive file support using 7-zip
• Plugins
• Localizable interface via resource DLL
• HTML-based Manual

What's New in version 2.12.4:

• Add more C/C++ types to syntax highlight (#2776705)
• Create config log file to My Documents-folder (#2789839)
• Bugfix: Reports had same left/right descriptions (#2772646)
• Bugfix: When conflict file saved trailing line-ending was lost (#2550412)
• Bugfix: File compare HTML reports use invald DOCTYPE (#2783477)
• Bugfix: "##" in file filter pattern caused an infinite loop (#2789345)
• Bugfix: Could select prediffer when plugins were disabled (#2787131)
• Bugfix: Opening mixed-EOL file one side forced both files to be handled as mixed-eol files (#2022312)
• Bugfix: Didn't show correct EOL chars if whitespace chars were turned off and again on (#2791402)
• Bugfix: Generated patch had wrong file time for UTF-16 files (#2791506)
• Bugfix: Did not export changed options values (#2799149)
• Bugfix: Reset the compare method to original if it was changed (#2802427)