WinMerge

From Wikipedia, the free encyclopedia

Template:Short description

Page Module:Message box/ambox.css has no content.

Page Module:Infobox/styles.css has no content.

WinMerge
[[Programmer|DeveloperTemplate:Pluralize from text]]WinMerge Development Team
Initial releaseNovember 20, 2000; 25 years ago (2000-11-20)
Template:Infobox software/simple
Written inC++
Operating systemMicrosoft Windows
Available inMultilingual
TypeData comparison
LicenseGPL
Websitewinmerge.org

Script error: No such module "Check for conflicting parameters".

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

  • 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

Page Module:Infobox/styles.css has no content.
WinMerge 2011 (discontinued)
[[Programmer|DeveloperTemplate:Pluralize from text]]jtuc
Initial releaseDecember 3, 2011; 14 years ago (2011-12-03)
Template:Infobox software/simple
Written inC++
Operating systemMicrosoft Windows
Available inMultilingual
TypeData comparison
LicenseGPL
Websitebitbucket.org/jtuc/winmerge2011
Repositorybitbucket.org/jtuc/winmerge2011
Script error: No such module "Check for conflicting parameters".
Page Module:Infobox/styles.css has no content.
WinMerge 2011
[[Programmer|DeveloperTemplate:Pluralize from text]]datadiode
Initial releaseDecember 3, 2011; 14 years ago (2011-12-03)
Template:Infobox software/simple
Written inC++
Operating systemMicrosoft Windows
Available inMultilingual
TypeData comparison
LicenseGPL
Websitegithub.com/datadiode/winmerge2011
Repositorygithub.com/datadiode/winmerge2011
Script error: No such module "Check for conflicting parameters".

For a planned development of version 3.x [1] no commits have been made to the 3.0 codebase since 2011.[2]

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.[3]

See also

Lua error in mw.title.lua at line 404: bad argument #2 to 'title.new' (unrecognized namespace name 'Portal').

References

Page Template:Reflist/styles.css has no content.

  1. ^ Page Module:Citation/CS1/styles.css has no content."WinMerge 3.x". wiki. bitbucket. 2011-03-10. Archived from the original on 2017-04-11. Retrieved 2012-09-10.
  2. ^ Page Module:Citation/CS1/styles.css has no content."commits". wiki. bitbucket. 2011-03-10. Archived from the original on 2017-04-11. Retrieved 2014-06-27.
  3. ^ Page Module:Citation/CS1/styles.css has no content."WinMerge 2011". bitbucket. 2014-04-28. Archived from the original on 2014-04-29. Retrieved 2014-04-28.