DiffScope compares text files side by side with word-level highlighting, resolves merge conflicts in a 3-way view with an editable result, compares whole folders, and shows binary files byte by byte in a hex view. It understands the command lines that TortoiseGit, git and Beyond Compare use, so it can take over as your diff and merge tool without rewriting your setup.
It is a portable app for Windows 10 and 11 (x64): unzip it and run it. No installer, no admin rights, no account.
What we care about
Fast
Opens instantly and stays smooth. Text views are virtualised for 200,000-line files, and binaries of 100 MB and more are streamed into the hex view instead of loaded all at once.
Private
Your code is nobody else’s business. The app has no telemetry, no account and no network access at all, and works fully offline. Read the privacy policy.
Tested
A wrong merge is worse than no merge. More than 740 automated tests and thousands of randomised fuzz cases run on every release, and diff and merge output is cross-checked against git itself.
Free
Free to download and use, with no trial, no licence key and no nag screens. See the license.
Correct before clever
A diff tool is only useful if you can believe it. DiffScope’s diff output is compared with git diff and its merge output with git merge-file, and both must match. When saving, it writes back the encoding, byte order mark and line endings it read, so a save never turns into a surprise whole-file change. The merge window only reports success to git or TortoiseGit when you have saved with no conflicts left.
How it is built
DiffScope is built with Electron, which lets one well-tested code base drive the text, merge, folder and hex views with smooth rendering on Windows. That is also why the download is about 150.8 MB: it includes its own copy of the Chromium runtime, so it does not depend on anything else being installed. The window runs in Chromium’s sandbox with a strict content policy; the security page has the details.
What comes next
Planned work is on the roadmap and every release is listed in the changelog. If you write about DiffScope, the press kit has logos, screenshots and ready-made descriptions.
Contact
A contact address is coming soon. In the meantime, the support page covers troubleshooting and how to report a problem.
