Diffinity

Michael Lidgren & Anders Nivfors · TrueHumanDesign.Diffinity

Diffinity is a free diff and merging tool for Windows with focus on accurate and easy to read source code diffs.

Diffinity is a free diff and merging tool for Windows with focus on accurate and easy to read source code diffs. It will compare the contents of two text files and show all differences line by line and also which individual characters/words that differs. Features: - Improved diffing quality for c-style source code and xml - Thumbnail view of all diffs - Folder comparison - 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 with support for tabs - Manual alignment markers - In-line diffs live updated as you type - Windows Explorer shell integration - Portable (can be run directly from an external device)