Jump to content

WinMerge

From Wikipedia, the free encyclopedia
WinMerge
Developer(s)WinMerge Development Team
Initial releaseNovember 20, 2000; 23 years ago (2000-11-20)
Stable release2.16.42.1[1] (July 28, 2024; 2 months ago (2024-07-28)) [±]
Repository
Written inC++
Operating systemMicrosoft Windows
Available inMultilingual
TypeData comparison
LicenseGPL
Websitewinmerge.org

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.

WinMerge runs on Microsoft Windows.

Features

[edit]
  • 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 IBM DevOps Code 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.

Codebases and forks

[edit]
WinMerge 2011 (discontinued)
Developer(s)jtuc
Initial releaseDecember 3, 2011; 12 years ago (2011-12-03)
Preview release
2011.009.217 / May 26, 2019; 5 years ago (2019-05-26)
Repositorybitbucket.org/jtuc/winmerge2011
Written inC++
Operating systemMicrosoft Windows
Available inMultilingual
TypeData comparison
LicenseGPL
Websitebitbucket.org/jtuc/winmerge2011
WinMerge 2011
Developer(s)datadiode
Initial releaseDecember 3, 2011; 12 years ago (2011-12-03)
Preview release
0.2011.211.170 / June 5, 2021; 3 years ago (2021-06-05)
Repositorygithub.com/datadiode/winmerge2011
Written inC++
Operating systemMicrosoft Windows
Available inMultilingual
TypeData comparison
LicenseGPL
Websitegithub.com/datadiode/winmerge2011

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]

See also

[edit]

References

[edit]
  1. ^ "Release WinMerge 2.16.42.1 · WinMerge/winmerge".
  2. ^ "WinMerge 3.x". wiki. bitbucket. 2011-03-10. Archived from the original on 2017-04-11. Retrieved 2012-09-10.
  3. ^ "commits". wiki. bitbucket. 2011-03-10. Archived from the original on 2017-04-11. Retrieved 2014-06-27.
  4. ^ "WinMerge 2011". bitbucket. 2014-04-28. Archived from the original on 2014-04-29. Retrieved 2014-04-28.
[edit]