Fast, friendly diff and merge tool.
Compare files side-by-side and resolve git merge conflicts — without leaving the terminal workflow.
Free · No account required · Linux & Windows available now
Compare any two files with colour-coded additions and removals. Syntax highlighting for Swift, Python, JavaScript, and more.
Resolve conflicts visually — use mine, use theirs, keep both, or edit manually. Navigate conflicts with keyboard shortcuts.
One-click setup configures MergeMate as your git difftool and git mergetool. Works with every repository.
Pastel colour palette that looks great in both light and dark mode, following your system preference automatically.
Full keyboard shortcut coverage so you can navigate, resolve, and save without reaching for the mouse.
Quickly reopen recent diff pairs from the welcome screen. MergeMate remembers your last ten comparisons.
Open Settings → Git Integration and click Set Up Git Integration. MergeMate installs the CLI helper and configures git in one step — no extra tools needed.
$ git difftool myfile.py # MergeMate opens automatically $ git mergetool # Resolve conflicts visually, save, done
Free to download. No subscription, no account, no catch.
Available now as a .deb package for Ubuntu and Debian-based systems.
Ubuntu 22.04+ · Free
Available now as an installer for Windows 10 and later.
Windows 10+ · Free
A native macOS version built in Swift is in development.
macOS 14 Sonoma and later