Diffinity

What Diffinity is

Diffinity is a free Windows utility for comparing and merging text files, with folder comparison for reviewing differences across directories. Its two-way view distinguishes added, removed, and changed lines, and can highlight differing characters or words. A thumbnail view summarizes where differences occur, while search can highlight instances of a selected word. For source code, the maker emphasizes readable comparisons and improved diffing for C-style code and XML. Editing and review features include syntax highlighting, customizable tabs, manual alignment markers, and inline diffs that update while typing. Diffinity supports Unicode, detects text encoding automatically, and warns when compared files use different encodings. It integrates with Windows Explorer, can run from an external device, and accepts file or folder paths and command-line options. Its documentation describes configuring it as a diff tool for Git and Perforce Helix P4V. The license permits free personal and commercial use and redistribution of unmodified copies, but prohibits modification and reverse engineering. The listed release is version 0.9.6, dated 2026-09-16, and requires .NET 8.0. It compares two inputs at a time and does not offer three-way merge.