True Human Design
Software / Diffinity

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.

 - 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

Click image for a larger view:

Diffinity text diff example
Diffinity source code diff example
Diffinity source code diff example with customized settings

Reviews, awards, anti-virus reports
    Editor's Pick - Tested by    

Version history
[Diffinity 0.8.3]         2017-03-13
- Added support for ctrl+insert/shift+insert for copy/paste
- Fixed diff line renderer which had several rendering artifacts
- Setting added for whether to listen to file changes on disk
- Setting added for scroll lock between left/right texts
- File changed on disk popup no longer messes up selection
- Several adjacent changed lines were sometimes handled as separate differences
- Notifications could incorrectly be shown during loading of large text files

[Diffinity 0.8.2]         2016-11-06
- First official version

PAD file
Xml file with program specifications used by shareware sites, download here.