Windows visual diff and merge for files and directories
WinMerge is a Windows tool for visual difference display and merging, for both files and directories. It is highly useful for determining what has changed between file versions, and then merging those changes. 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...
...Currently 45 standard applications are supported. more supported applications will be available soon...
Windows network deployment/management will be available Q3 2013.
Supported on Windows XP, Vista, 7, 8 and 2008R2.