WinMerge 2.6.4 by WinMerge Team

News:

New icons and splash screen
Simpler and auto-closing folder compare progress bar
Line numbers in file compare
Word-wrap in file compare
GUI for bookmarks in file compare
Better character-level difference indication in file compare
New Short size- columns in folder compare
Merge difference which has cursor inside it (no need to select difference first)
Improved Project file saving and editing
Creating patch file from multiple files (selected in folder compare)
User-defined folder for file filters
New folder compare types to compare by sizes or modify times
Renaming items in folder compare
Description:

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.

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
Highlights differences inside lines
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
http://winmerge.sourceforge.net/downloads.php