Diffy compares text, XML and images side by side, lets you merge hunk by hunk, and edits both panes live. It was built against USSD-browser VXML exports — 40,000 lines on one line, sometimes UTF-16, often with Urdu in the middle — so a normal config file is a holiday.
One email when it ships. No date announced yet.
Both are the same portable executable. Merging, hunk take/skip and undo unlock with a licence key; nothing else is held back.
Colours and syntax classes taken from Diffy's own theme tables.
Original against Modified, side by side or unified. Syntax highlighting for XML/VXML, PHP, JS/TS, C#, Python, SQL, CSS and JSON. Line-number gutters with change marks, a minimap, prev/next navigation, per-hunk Take ← / Take → / Skip with undo and redo, editable panes that re-diff as you type, and a status bar carrying encoding, line endings and the change count.
</block> lines, any algorithm can pair the wrong one and everything below looks shifted. Put the cursor on a line you know matches in each pane, press Ctrl+Alt+A, and the region above and below re-diff independently.A multi-tab viewer and editor for one file at a time: outline tree, find and replace, column selection, rendered Markdown and HTML, native PDF viewing, per-tab zoom. Both screens share the light and dark theme and remember your session.
Exit code 0 identical, 1 different, 2 error. Emit a unified patch or a self-contained HTML report. Register it as Git's difftool and git difftool HEAD~1 opens each changed file with the older side on the left.
Desktop utilities for developers, designers and the people who keep their servers running.