WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.

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 in file compare
  • Regular Expression based file filters in directory compare allow excluding and including items
  • Moved lines detection in file compare
  • Creates patch files
  • Shell Integration (supports 64-bit Windows versions)
  • Rudimentary Visual SourceSafe and Rational ClearCase integration
  • Archive file support using 7-Zip
  • Plugin support
  • Localizable interface via resource DLL
  • Online manual and installed HTML Help manual

What's New

File compare

  • Allow NUL and \.\NUL in paths specified as command line arguments (PR #2056)
  • Added "(F4)" to the description of the toolbar icon "Difference in the Current Line". (#2050)
  • Fix a crash problem when the Diff algorithm is set to something other than default and one file does not have an EOL of the last line and the other file has an EOL of the last line.

Image compare

  • BugFix: Fixed the issue where .png is added when saving even if the file format does not use a converter such as jpg or png file.

Folder compare

  • BugFix: Folder compare omits unique folders from results if they contain any files and/or subfolders folder compare/merge (#2046)

Line filters

  • Modify the "Line Filters" dialog. (PR #2047)

Substitution filters

  • Modify the "Substitution Filters" dialog. (PR #2068)

Translation updates:

  • French (PR #2055,#2058)
  • Korean (PR #2057,#2059,#2060)

Internals

  • Small code changes for CMDIChildWnd handling (#2043)