A diff and merging tool with focus on accurate and easy to read source code diffs.
diffinity is a diff and merging tool with focus on accurate and easy to read source code diffs. it will compare the content of two files and present the differences in an easy to read line by line and char by char basis.
features: improved diffing quality for xml and cstyle source code thumbnail view of all diffs differentiates between changed, removed and added lines instance highlighting double click or search for a word to show all instances of it syntax highlighting supports unicode and auto detects encoding (and warns if encoding mismatch) customizable interface in line diffs live updated as you type windows explorer shell integration
Productivity Developer Tools File Management
portable diffing readability diff file-compare merging xml accurate thumb-view xaml
WinMerge 2011 series is a fork of the original WinMerge application that compiles without ATL/MFC dependencies.
winmerge jp is a fork of original winmerge that incorporates many own features including 3-way compare, high dpi support and many more.
