WinMerge - is an Open Source compare and merge tool for Windows. Can compare both files and folders, displaying the differences in a visual text form that is easy to understand and process.
Will be very useful for identifying places that have changed between versions of a project, and then it allows you to merge changes between versions. WinMerge can be used as an external difference/merge determination tool, or as a standalone application.
In addition, WinMerge has many auxiliary features that make the process of comparing, synchronizing, and merging as easy as possible:
File Comparison
Visual highlighting of text file changes and merges
User-friendly redactor with syntax highlighting, line numbering and line breaks
Change highlighting within a line
Differences panel shows the differences of the current file in two vertical panels
Location panel shows a map of the compared files
Detect moved lines
Directory content comparison
File filtering based on regular expressions allows you to include and exclude items from the sample
Fast comparison that takes file sizes and dates into account
Comparison of a single directory, or comparison including subdirectories
Can display the result of a folder comparison in a tree view
Version control
Creates patch files (Normal-, Context- and Unified formats)
Resolve file conflicts
Initial support for Visual SourceSafe and Rational ClearCase integration
Integration with context menu (supports 64-bit Windows versions)
Support for archives using 7-Zip
Plugins support.
Localizable interface
Online manual and installed HTML manual
PASSWORD: 123
