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.
- Visual differencing and merging of text files
- Flexible editor with syntax highlighting, line numbers and word-wrap
- Highlights differences inside lines
- Difference pane shows current difference in two vertical panes
- Location pane shows map of files compared
- Moved lines detection
- Compare folders in one level or recursive
- Can show folder compare results flat or in a tree-style view
- Regular Expression based file filters allow excluding and including items
- Compares binary files in folder compare as well as text files
- Shell Integration (supports 64-bit Windows versions)
- Archive file support using 7-Zip
- Fast compare using file sizes and dates
- Creates patch files (Normal-, Context- and Unified formats)
For me still the best free Diff-Merge-Tool! Only draw backs I realized: 1. The way to specify a specific encoding to be used for files 2. No way to manually sync diffed blocks - like Beyond Compare has Hold on and ... I'm very curious about the redesigned version 3!