WinMerge – is a Windows tool for visual difference display and merging, for both files and directories. It is highly useful for determining what has changed between file versions, and then merging those changes. WinMerge has Unicode support, Flexible syntax coloring editor, Visual SourceSafe integration, and Windows Shell integration. Regexp filtering for filenames and lines. Side-by-side line difference and highlights differences inside lines. A file map shows the overall file differences in a location pane. The user interface is translated into several languages.
Features
• Visual differentiating 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
Download
WinMerge 2.16.12 (14 MB)
WinMerge 2.16.12 Portable (9 MB)