WinMerge

WinMerge is a Windows tool for visual difference display and merging, for both
files and directories. Unicode support. Flexible syntax coloring editor. Windows
Shell integration. Regexp filtering. Side-by-side line diff and highlights diffs
inside lines.

Notable new items in the 2.14.0 stable release:

• Update PCRE to version 8.10
• Update SCEW to version 1.1.2
• Improve startup time (#2788142)
• Add menuitems for selecting automatic or manual prediffing
• Add accelerator keys for Shell context menu
• Add /xq command line switch for closing WinMerge after identical files and not showing message
• Allow setting codepage from command line
• Allow giving encoding name as custom codepage
• Add options GUI for quick compare limit
• Expand/collapse folders from keyboard
• Improve detecting XML files in file compare

• Lots of language updates

• Bugfix: Shell extension uses unquoted program path

• Bugfix: Compare by size always checked file times too
• Bugfix: Crash when pasting from clipboard
• Bugfix: Keeps verifing path even turned off in options
• Bugfix: "+" and "-" from the number block don't work in the editor
• Bugfix: Date format did not respect Regional Settings
• Bugfix: WinMerge contained a vulnerability in handling project files (http://www.zeroscience.mk/mk/vulnerabilities/ZSL-2011-4997.php)

• Bugfix: WinMerge was vulnerable to DLL hijacking as described in Microsoft Security Advisory (2269637)

• Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime libraries installer

• Installer: Remove Uninstall shortcut from start menu folder
• Installer: Don't install quick launch icon for Windows 7

The new version can be downloaded from:
http://sourceforge.net/projects/winmerge/files/stable/2.14.0/

NOTE: 7-zip plugin installer is downloadable from:
http://sourceforge.net/projects/winmerge/files/7-zip-plugin/

Regards
Christian List