WinMerge
WinMerge is a free software tool for data comparison and merging of text-like files. It is useful for determining what has changed between versions, and then merging changes between versions.
Developer(s) | WinMerge Development Team |
---|---|
Initial release | November 20, 2000 |
Stable release | 2.16.8[1] (August 28, 2020 ) [±] |
Repository | |
Written in | C++ |
Operating system | Microsoft Windows |
Available in | Multilingual |
Type | Data comparison |
License | GPL |
Website | winmerge |
Developer(s) | jtuc |
---|---|
Initial release | December 3, 2011 |
Preview release | 2011.009.217
/ May 26, 2019 |
Repository | |
Written in | C++ |
Operating system | Microsoft Windows |
Available in | Multilingual |
Type | Data comparison |
License | GPL |
Website | bitbucket |
For a planned development of version 3.x [2] no commits have been made to the 3.0 codebase since 2011.[3]
In 2011 a fork of the 2.x codebase titled "WinMerge 2011" was created. This new branch has continued to see active feature and bug fix development. It has also removed ATL/MFC dependencies so that WinMerge can be built using the free Visual C++ Express editions.[4]
WinMerge runs on Microsoft Windows.
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 (as of version 2.8.0, UTF-8 files are correctly read without a BOM).
- Difference pane shows current difference in two vertical panes.
- Location pane shows map of files compared.
- Highlights differences inside lines in file compare.
- Can also generate HTML report with differences highlighted.
- Regular expression based file filters in directory compare allow excluding and including items.
- Moved lines detection in file compare.
- Ability to ignore whitespace and letter case changes.
- Creates patch files.
- Shell integration (supports 64-bit Windows versions).
- Rudimentary Visual SourceSafe and Rational ClearCase integration.
- Archive file support using 7-Zip.
- Plug-ins.
- Language localization via plain-text PO files.
- Online manual and installed HTML help manual.
- Generates normal, context, and unified patches.
See also
References
- "Release WinMerge 2.16.8 · WinMerge/winmerge". 2020-08-28. Retrieved 2020-10-19.
- "WinMerge 3.x". wiki. bitbucket. 2011-03-10. Archived from the original on 2017-04-11. Retrieved 2012-09-10.
- "commits". wiki. bitbucket. 2011-03-10. Archived from the original on 2017-04-11. Retrieved 2014-06-27.
- "WinMerge 2011". bitbucket. 2014-04-28. Archived from the original on 2014-04-29. Retrieved 2014-04-28.
External links
- Official website
- WinMerge on SourceForge.net
- WinMerge Development Wiki
- Compare and merge files and folders with WinMerge Lifehacker
- WinMerge Portable
- Sdottaka's WinMerge on BitBucket and on GitHub (an active[2017] fork with additional features and Japanese language support)
- WinMerge 2011 on BitBucket and on GitHub (an active[2017] fork with additional features)
This article is issued from Wikipedia. The text is licensed under Creative Commons - Attribution - Sharealike. Additional terms may apply for the media files.