WinMerge is an open source instrument that allows you to merge and compare files and folders.
WinMerge can be used to determine the differences between project versions. WinMerge comes with Unicode support, a flexible syntax coloring editor, Visual SourceSafe integration, and Windows Shell integration.
All you have to do is launch the application and select the files you want to merge.
Here are some key features of "WinMerge":
· Highlights differences inside lines
· Difference pane shows current difference in two vertical panes
· Location pane shows map of files compared
· Moved lines detection
· Compare folders in one level or recursive
· Can show folder compare results flat or in a tree-style view
· Regular Expression based file filters allow excluding and including items
· Compares binary files in folder compare as well as text files
· Shell Integration (supports 64-bit Windows versions)
· Archive file support using 7-Zip
· Creates patch files (Normal-, Context- and Unified formats)
What's New in This Release: [ read full changelog ]
· Update PCRE to version 8.10
· Update SCEW to version 1.1.2
· Improve startup time (#2788142)
· Add menu items 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
· Bugfix: WinMerge was vulnerable to DLL hijacking as described in Microsoft Security...