DiffMerge is a free, native Mac application from SourceGear that lets you inspect differences between files side-by-side and resolve conflicts by blending changes into a single merged output.
What is DiffMerge?
DiffMerge is a desktop diff and merge tool for macOS (and other platforms) that renders line-by-line and character-level changes between text files in a clean, colour-coded interface. Unlike a quick diff call in Terminal, it gives you a persistent, scrollable canvas where you can accept, reject, or hand-edit every change before writing the final file. SourceGear has been shipping and maintaining it for well over a decade, which is reassuring in a tool you trust with source code.
At its core it handles two workflows: two-way diff (compare any two files) and three-way merge (combine edits from two branches against a common ancestor). The three-way mode is where it really earns its keep — if you've ever tried to untangle a gnarly Git merge conflict in a plain text editor, you'll feel the difference immediately.
What does DiffMerge do best?
Three-way merging with a live ancestor pane is DiffMerge's standout strength — it shows you exactly whose change caused a conflict, which makes accepting or discarding hunks a deliberate, informed act rather than guesswork.
The colour-coded gutter is well-calibrated: insertions, deletions, and conflicts each get a distinct hue, and the minimap on the side of the window lets you jump to the next conflict with a single click. For long files — say, a 2,000-line SQL migration or a sprawling config file — that spatial overview saves real time.
I've also come to rely on its folder-diff mode. Point it at two directories and it produces a tree view showing which files differ, which are unique to each side, and which are identical. It's a practical way to audit what changed between two build outputs or synced folders without reaching for a heavier tool.
- Two-pane file diff with intra-line change highlighting
- Three-way merge with ancestor pane and conflict navigator
- Folder diff with recursive tree comparison
- Git/SVN/Mercurial integration — configure it as your mergetool in a single line
- Syntax-aware rules to ignore whitespace, line endings, or comments
Is DiffMerge free?
Yes — DiffMerge is free to download and use with no feature restrictions or usage limits. SourceGear offers it as a goodwill tool to the developer community; there is no pro tier or subscription upsell hiding behind the free version.
That said, it is closed-source, so you're trusting SourceGear's release cadence. Updates have historically been infrequent, though the app is stable and the core workflows haven't needed to change much. If open-source provenance matters to you, alternatives like Meld or KDiff3 exist, but neither matches DiffMerge's macOS polish.
Who should use DiffMerge?
Developers who live in Git and want a GUI merge tool they can configure once and forget about are the primary audience. It slots neatly into any workflow as git mergetool or git difftool — a single entry in ~/.gitconfig is all it takes.
Beyond developers, I've seen it used by technical writers diffing document versions, sysadmins comparing config file snapshots between servers, and QA engineers auditing build artifacts. Essentially: if your work involves text files and you've ever wished diff output were more navigable, DiffMerge is worth installing.
Where it's less suited: binary files, image diffs, or anything that demands a real-time collaborative review workflow (for that, look at what your Git host — GitHub, GitLab, Bitbucket — offers natively in the pull-request UI).
How does DiffMerge compare to Kaleidoscope and FileMerge?
DiffMerge is free; Kaleidoscope 3 costs a subscription or one-time fee and justifiably so — its image diff, folder sync, and overall UI refinement are a tier above. If you need image comparison or you spend all day in diffs, Kaleidoscope is worth the price. DiffMerge is the answer when you want a capable, no-cost tool that just works.
FileMerge (bundled with Xcode) covers the basics but lacks a minimap, folder diff, and the conflict-navigation affordances that make DiffMerge faster on large files. VS Code's built-in diff is excellent for single-file reviews inline but awkward for true three-way merges. DiffMerge occupies the sweet spot: more power than FileMerge, zero cost compared to Kaleidoscope.
What are the best DiffMerge alternatives?
The strongest alternatives on macOS are Kaleidoscope 3 (premium, image-aware, polished), Beyond Compare (cross-platform powerhouse with a one-time licence fee), and FileMerge (free with Xcode, basic). For command-line-first developers, vimdiff or the built-in diff views in VS Code and JetBrains IDEs may be sufficient. None of these match DiffMerge's combination of zero cost and dedicated three-way merge UI.
