DiffinDiffinity is a and merging tool with focus on accurate source code diffs.
Diffinity is a free diff and merging tool for Windows with focus on accurate and easy to read source code diffs.
Features:
- Improved diffing quality for xml and c-style 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