Desktop app for macOS, Windows, and Linux
See what changed.
Decide what stays.
ZingDiff compares two folders, two files, or two pasted texts, then walks a three-way merge when both sides edited the same lines. The trial is the full app for 7 days.
- Trial
- 7 days, full app
- License
- Version 1, perpetual
- Computers
- 3 per purchase
Drag the bar between the editors. Change either side and the marks follow the words that differ.
Folders
The list opens on modified files.
Drop two folders, or browse to them. Same files stay out of the way until you ask for them. Modified is the default, as it is in the app.
Three-way merge
A conflict stays marked until you take a side.
Give ZingDiff the local file, the common base, and the remote file. Unresolved lines stay in the result. Take local, remote, or both.
Git
Point Git at the same app.
Install the zingdiff command from the Help menu. --wait exits 0 when you save, 1 if you close without saving, and 2 when the trial has ended.
git config --global diff.tool zingdiff git config --global difftool.zingdiff.cmd 'zingdiff --wait "$LOCAL" "$REMOTE"' git config --global merge.tool zingdiff git config --global mergetool.zingdiff.cmd 'zingdiff --wait --merge "$LOCAL" "$REMOTE" --base "$BASE" --output "$MERGED"'
License
Try the whole app. Pay once for version 1.
The trial is the full app. A paid key and a free key activate the same way. The direct download and the Mac App Store are separate purchases.
Trial
7 days
Every feature, on one computer. No card. When the days run out, the app waits for a key.
Download the trialZingDiff 1
$6.99 one-time
- Perpetual license for major version 1
- Three computers
- Works offline after activation
- Updates inside version 1
If you can’t pay
Ask
Write a short note from the app, or from here. A free key comes back after the note is read. It activates the same way as a paid key.
Request a free licenseDownload
The trial is the full desktop app.
A key from this site is for the direct download. The Mac App Store copy uses Apple’s receipt and does not take that key. Signed installers replace these requests once they are published.