CORE FEATURES ARE FREE

A Native Mac Diff Tool with Free Core Features

Compare files and folders, inspect differences and work through three-way merges on Mac. MergeDock keeps core comparison work free, with an optional one-time Pro upgrade for additional features.

Core features are free to use. Pro is an optional one-time upgrade. Requires macOS 26 or later.

MergeDock: three-way text merge
MergeDock: three-way text merge

Comparison guides

Choose the view that matches the change

A diff tool is most useful when its view matches the material in front of you. Use side-by-side comparison for two files, three-way merge for a BASE, LOCAL and REMOTE decision, folder comparison for many items, and image comparison when pixels matter.

Compare and merge for free

Basic file and folder comparison, two-way editing and three-way merge are free to use. A comparison only shows the differences until you choose a change or save a result.

CORE FEATURES ARE FREE

  • Compare files and folders
  • Edit selected changes in two-way comparison
  • Work through a three-way merge

Additional features with Pro

Folder Sync preview is free. Pro unlocks execution of the sync plan and advanced image views.

  • Run a Folder Sync plan
  • Use overlay, slider, blink and difference views

Choose a view for the work you need to do

MergeDock workflows and their Free or Pro requirements.
Your taskView or integrationWhat you can do in MergeDock
Review changes in code or configurationTwo-way text comparisonInspect differences, apply selected edits and save. Free.
Resolve text conflictsThree-way text mergeCompare base, left and right; edit and save the merge result. Free.
Review or update two foldersFolder comparison and syncCompare and copy selected items for free. Execute a sync plan with Pro.
Check visual changes in screenshotsImage comparisonSide-by-side is free. Overlay, slider, blink and difference views require Pro.
Inspect non-text filesBinary comparisonReview byte differences in a dedicated binary view.
Open Git changes or conflictsGit difftool / mergetoolConfigure Git integration, open a comparison and save a merge result before returning to Git.

When MergeDock may fit

MergeDock may fit when you want one native Mac workspace for text, folders, images and binary files, with free core comparison and merge work.

Questions before you switch

Can I use MergeDock with Git?

Yes. Configure MergeDock as Git’s external difftool or mergetool. Difftool opens a comparison; mergetool opens a merge session. Save the merge result before completing the session and returning to Git. The Git guide covers setup and the file-access permissions required on macOS.

What can I do for free?

Basic file and folder comparison, two-way editing and three-way merge are free. Additional features, including running Folder Sync and advanced image comparison, require Pro.

Which features require Pro?

Running Folder Sync and advanced image comparison require Pro. Pro is an optional one-time in-app upgrade; check the in-app purchase screen for current pricing in your region.