WinMerge is a tool for visual difference display and merging, for both files and directories. WinMerge is highly useful for determing what has changed between project versions, and then merging the changes between versions. WinMerge has Unicode support, Flexible syntax coloring editor, Visual SourceSafe integration, and Windows Shell integration.
Regexp filtering for filenames and lines. Side-by-side line difference and highlights differences inside lines. A file map shows the overall file differences in a location pane. The user interface is translated into several languages.
Here are some key features of "WinMerge":
· Visual differencing and merging of text files
· Flexible editor with syntax highlighting, line numbers and word-wrap
· 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
· Fast compare using file sizes and dates
· Creates patch files (Normal-, Context- and Unified formats)
What's New in This Release: [ read full changelog ]
· Update release compiler and runtimes to VS2008
· Remove ANSI binaries from distribution
· Drop support for W95, W98, WME and NT4
· Update to PCRE 8.10 (r7210)
· Update SCEW to 1.1.2 (r7212)
· In-line difference highlighting improvement (#3022014)
· Make comment filtering work for folder compare (#3046938)
· Recognize .ascx files as ASP files (#3042393)
· Comment filtering improvement (#3034083)
· Allow giving encoding name as custom codepage (#2813825, #3010934)
· Installer: Drop Windows 9x/ME/NT4 support from InnoSetup (#3025078)
· Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed in status bar (#3025855)
· Bugfix: Options dialog didn't update when importing settings from .ini file. (#2794137)
· Bugfix: New fix for the bug #2210403 (#2929005)
· Bugfix: Take changed compareoptions into use in folder compare (#3046938)
· Bugfix: "Copy and advance" toolbar icons not automatically enabled (#3033325)
· Bugfix: Location pane focus enabled "Save" (#3022292)
· Bugfix: WinMerge was vulnerable to DLL hijacking as de...
Find us on Google+
