WinMerge Updates

WinMerge is a Win32 tool for visual difference display and merging, for both files and directories.

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
• Resolve conflict 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
• Online manual and installed HTML Help manual

WinMerge 2.12.4 Release

WinMerge 2.12.4 is an bug-fix release fixing few important bugs found from the 2.12.2 release. For a complete changelog history, see the ChangeLog.txt file located in the Docs folder under the WinMerge program folder.

Bugs fixed

• When folder compare method changed during the compare it was not reset back to original. This caused some surprising behavior and missing info.
• Reports had same left/right description
• When conflict file was saved trailing line-ending was lost
• Opening mixed-EOL file one side forced both files to be handled as mixed-eol files
• Generated patch had wrong file time for UTF-16 files
• "##" in file filter pattern caused an infinite loop