WinMerge is an open Source visual differencing and merging tool
WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms.

WinMerge is highly useful for determing what has changed between project versions, and then merging the changes between versions.

Here are some key features of “WinMerge”:

· 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

What’s New in This Release:

· Now uses expat + scew for XML handling (partially converted)
· Now uses PCRE for regular expressions (partially converted)
· New folder compare icons
· New bookmarks icons
· Manifest files in resource, no need for separate files
· Bug fix: WinMerge/Filters folder was always created
· Bug fix: modality problems in file selection dialogs
· Bug fix: crash if file modification time was missing
· Bug fix: /x parameter didn’t work with some other parameters
· Bug fix: asked sometimes twice about saving modified files

Welcome back!