Portable WinMerge description
An Open Source visual differencing and merging tool

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

Here are some key features of "Portable 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