Diffinity is a text comparison and merging tool focused on source code differences. The program compares the contents of two text files and displays the differences by line as well as individually modified characters/words. The program supports folder comparison, drag and drop, a thumbnail view of all differences, instance and syntax highlighting, update as-you-type (live view), customisable interface, and more.
Displays differentiation between changed, removed and added lines. Auto-detects Unicode encoding.