WinMerge
From Wikipedia, the free encyclopedia
 |
|
|---|---|
 WinMerge 2.5.x.x under Windows XP |
|
| Maintainer: | WinMerge Development Team |
| Stable release: | 2.6.0 (October 12, 2006) [+/-] |
| Preview release: | 2.5.6 (Sep 11, 2006) [+/-] |
| OS: | Microsoft Windows |
| Use: | File comparison |
| License: | GPL |
| Website: | winmerge.org |
WinMerge is a free software tool for file comparison and merging text-like files. It is useful for determining what has changed between versions, and then merging changes between versions.
WinMerge runs on Microsoft Windows.
[edit] Features
- Visual differencing and merging of text files.
- Flexible editor with syntax highlighting, line numbers and word-wrap.
- 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.
