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
General
- BugFix: When using an ini file all differences are displayed as black sections (#1799)
- Reduced file size of WinMergeU.exe for 32-bit version
File compare
- BugFix: Fixed an issue where XML format files, such as vcxproj, were not being syntax highlighted.
- BugFix: Fixed an issue where the EOL character was not being displayed in the ARM64 version.
- Modify the “Go to” dialog. (PR #1779)
Image compare
- BugFix: Middle Click to close image tab crash (#1785)
- BugFix: Fixed an issue where the changed Color distance threshold value would revert back to 0 the next time WinMerge was started.
- Image compare: Increase color distance threshold (CD Threshold) (winmerge/winimerge #29)
Filters
- Updated file filters to allow UTF-8 without BOM.
Options dialog
- BugFix: Fixed an issue where the shell integration category page in the
- Options dialog was not displaying correctly in version 2.16.29.
- BugFix: Fixed an issue where plugin settings were not exported when exporting from the Options dialog.
Plugins
- BugFix: Fixed an issue where the ApplyPatch plugin was not functioning correctly when the ‘Plugins -> Manual Unpacking’ menu item was checked.
- BugFix: Fixed the problem that the plug-in setting window cannot be opened on 32-bit OS
- Added a “Plugin Settings” button to the “Select Plugin” window.
- Make the plugin settings dialog translatable and enable saving settings to an INI file (PR #1783)
Command line
- BugFix: Fixed the problem that the /fr option is ignored when specifying the command line option /new
- BugFix: Fixed the problem of not moving to the conflicted line after auto-merge.
Project file
- BugFix: Opening a project fails when a path has environmental variables in it. (#1793)
Installer
- BugFix: Unsuccessful installation, Portable Win32 version (#1802)
