Free, open-source diff & merge for macOS

Every difference,
made obvious.

A native Mac app for comparing and merging text, images, and folders, with git built in. Paste snippets straight in, merge against a base, or browse a repository's history. Native SwiftUI on Liquid Glass, with diff and merge engines written from scratch in Swift.

v0.4.0 · Apple-notarized · free & open source · requires macOS 26

Differentialis comparing two versions of a Swift file side by side, with changed lines and characters highlighted
Signed & notarized by Apple Updates itself Command-line launcher Apple Silicon & Intel MIT licensed

What it does

One app for every kind of change.

01

Text diff that reads minds

A from-scratch Myers engine with character-level highlights, split and unified layouts, whitespace-insensitive matching, line-ending checks, collapsible regions, and jump-to-change navigation.

02 New

Paste, compare, merge

No files needed. Paste two snippets side by side, watch the diff update as you type, and copy any change across in one keystroke.

03

Pixel-perfect image diff

Two-Up, One-Up blink, Split reveal, and a false-color Difference mode where only the changed pixels glow, with synced zoom and pan.

04

Whole-folder compare

A recursive scan tags every file Added, Removed, Modified, or Identical. Filter by name or status, then drill straight into the right diff.

05

Three-way merge

Base, left, and right with an editable result. Take a side, take both, or hand-edit, with conflicts and line-ending clashes called out.

06

Git, built in

Open any repository to browse its history and its staged and unstaged changes. Then compare any reference, commit, or the working copy from the Custom Comparison popover. Save the ones you reach for and reopen them live. It runs on the system git, so there's nothing extra to install.

07

Make it yours

Light, dark, or auto on native Liquid Glass. Pick a built-in theme, build your own, or import a .tmTheme, then set the code font and size.

Take the tour

Built to be lived in.

The Differentialis welcome screen with cards for text, pasted text, image, folder, 3-way merge, and repository comparisons

Start anywhere

Pick a comparison, or just drop files in.

Choose a mode from the welcome screen, drag files or folders anywhere on the window, or open a comparison straight from the terminal.

differentialis a.swift b.swift
differentialis release-1.0 release-1.1
differentialis base.txt mine.txt theirs.txt
A split text diff of MissionControl.swift, with changed characters highlighted and an unchanged region collapsed

Text

See exactly what changed, down to the character.

Lines pair up across the split, changed characters light up, and long unchanged runs fold away. Switch between split and unified with ⌘U, and step through changes with ⌘] and ⌘[.

Two pasted Swift snippets side by side in editable panes, with changed lines highlighted and Copy to A and Copy to B buttons

Paste Text New

Compare snippets without saving a single file.

Press ⌘T, paste into two side-by-side editors, and the diff updates as you type. The panes scroll together and show line numbers. Click a change and copy it across with ⌥⌘→ or ⌥⌘←, with full undo.

Two versions of an illustration shown side by side in the Two-Up image mode
The Difference image mode, where only the changed pixels show

Images

Spot the pixel that moved.

Two-Up side by side, One-Up blink, a draggable Split, and a false-color Difference mode where only the changed pixels glow. Zoom and pan stay in sync, and ⌘1–⌘4 switch modes.

A folder comparison listing added, deleted, and modified files, with the diff of the selected file beside it

Folders

Diff entire directory trees.

Every file is tagged Added, Removed, Modified, or Identical. Show just the changes or everything, filter by name or status, and pick any file to see its diff right alongside.

A three-way merge showing changes taken from the left and right automatically and one conflict to resolve

Merge

Resolve conflicts against a common base.

Changes made on only one side merge on their own. Real conflicts wait for you: use left, right, both, or the base, or edit the result by hand before you save.

A repository's commit history, the files changed in the newest commit, and a unified diff of one of them

Git

History, changes, and any comparison you can name.

Browse commits and see what each one touched, or switch to your working changes, staged and unstaged. Compare… lines up any reference, commit, or the working copy against another, and saves it for later.

A unified text diff in the light appearance
The Settings window with appearance, color themes, and code font options

Themes

Light, dark, or both.

Follow the system or pick an appearance, then choose a theme for each: Differentialis, Mariana, Monokai, One Dark, Solarized, or GitHub. You can also build your own, import a .tmTheme, and set the code font, with ⌘+ / ⌘− or a pinch to resize.

FAQ

Questions, answered.

What is Differentialis?

Differentialis is a free, open-source Mac app for comparing and merging files. It shows the differences between two text files, pasted snippets, images, or folders, resolves three-way merges, and browses git history. It's built natively with SwiftUI and Liquid Glass for macOS 26.

Is Differentialis free?

Yes. Differentialis is free and open source under the MIT license. Download the Apple-notarized .dmg from GitHub Releases; there's no account, subscription, or telemetry.

Which Macs does Differentialis run on?

Differentialis requires macOS 26 Tahoe or later and runs natively on both Apple silicon and Intel Macs.

How do I compare two text files on a Mac?

In Differentialis, choose New Text Comparison (⌘N) and pick the two files, or drag both files onto the window. The diff shows the files side by side or unified, with changed characters highlighted. From Terminal, run differentialis file1 file2 after installing the command-line tool from the app menu.

Can I compare text without saving it to files?

Yes. Paste Text (⌘T) opens two side-by-side editors. Paste or type into each, and the diff updates as you edit. You can copy any change from one side to the other, with undo.

Can Differentialis compare images and folders?

Yes. Images can be compared in Two-Up, One-Up (blink), Split, and Difference modes, for PNG, JPEG, HEIC, and any other format macOS can open. Folder comparison scans both trees and marks every file as added, removed, modified, or identical, with a diff for each file.

Does Differentialis work with git?

Yes. Open a repository to browse its commit history and its staged and unstaged changes, and compare any branch, tag, or commit against another or against your working copy. Differentialis uses the git already on your Mac.

Can Differentialis do a three-way merge?

Yes. Choose a base, left, and right file. Changes made on only one side merge automatically, and conflicts are shown side by side so you can use left, right, both, or the base, or edit the result before saving. Unresolved conflicts are saved with standard conflict markers.

Does Differentialis upload my files?

No. Every comparison and merge runs locally on your Mac, and Differentialis never uploads your files. Its own network traffic is checking GitHub Releases for updates, and downloading one when you choose to update. There's no account and no telemetry.

How do I install and update Differentialis?

Download the Apple-notarized .dmg from the latest GitHub release, open it, and drag Differentialis to Applications. After that it updates itself: it checks for new versions automatically, and you can choose Check for Updates… from the app menu at any time.

Can I use Differentialis as a git difftool or mergetool?

Yes. The differentialis command-line tool takes --wait, which keeps git waiting until you finish in the app, and --output for merges, so Save writes the result straight to the conflicted file. Add the difftool and mergetool entries from the README to your ~/.gitconfig, and if you installed the command-line tool before version 0.4.0, uninstall and reinstall it from the app menu.

Is Differentialis available for Windows or Linux?

No. Differentialis is a native macOS app built with SwiftUI and Liquid Glass, so it runs only on Macs with macOS 26 Tahoe or later. Its source code is MIT licensed on GitHub.

How is Differentialis different from FileMerge?

FileMerge (opendiff) comes with Xcode and compares text files and folders. Differentialis doesn't need Xcode, and adds image and pasted-text comparison, git history and branch comparisons, and color themes with custom and .tmTheme import.

Get Differentialis.

Download the notarized .dmg, drag it to Applications, and open. After that it keeps itself up to date. No setup, no account, no telemetry.

Download for macOS

v0.4.0 · Apple Silicon & Intel · macOS 26 Tahoe