WinMerge

From Wikipedia, the free encyclopedia
Jump to: navigation, search
WinMerge
WinMergeLogo.png
Developer(s) WinMerge Development Team
Initial release Nov 20, 2000
Stable release 2.14.0 (February 2, 2013; 21 months ago (2013-02-02)) [±]
Preview release 2.13.22 (svn) (January 13, 2013; 21 months ago (January 13, 2013)) [±]
Written in Visual C++
Operating system Microsoft Windows
Available in Multilingual
Type Data comparison
License GPL
Website winmerge.org
WinMerge 2011
WinMergeLogo.png
Developer(s) WinMerge Development Team
Initial release Dec 3, 2011
Written in Visual C++
Operating system Microsoft Windows
Available in Multilingual
Type Data comparison
License GPL
Website bitbucket.org/jtuc/winmerge2011

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.

The project is currently in background development of version 3.x, with no known date for release.[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]

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 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[edit]

External links[edit]

References[edit]

  1. ^ "WinMerge 3.x". wiki. bitbucket. 2011-03-10. Retrieved 2012-09-10. 
  2. ^ "commits". wiki. bitbucket. 2011-03-10. Retrieved 2014-06-27. 
  3. ^ "WinMerge 2011". bitbucket. 2014-04-28. Retrieved 2014-04-28.