Review code and configuration changes.
Compare files side by side, inspect the differences and apply the changes you choose before saving.
Diff and merge, made for Mac
Review changes.
Apply what you choose.
Compare text, folders, images and binary files in a native macOS app. Use two-way editing, three-way merge and Git integration in one workspace.
Core features are free. Pro is a one-time in-app upgrade. Requires macOS 15 or later.
Four comparison types
Text · Folder · Image · Binary
2-Way & 3-Way
Review, edit and merge
Git difftool & mergetool
Use the comparison workspace from Git
One-time Pro upgrade
Upgrade in the app when you need more
Comparison guides
Choose a comparison guide.
Clear steps for files, Git conflicts and folder changes.
2-WAY FILES
Two-way file comparison
Compare two files and apply only the changes you choose.
Read the file comparison guide ↗ 3-WAY / GIT Git diff and mergeReview BASE, LOCAL and REMOTE before saving MERGED.
Read the Git guide ↗ FOLDERS Folder comparisonReview changes and a sync plan before copying.
Read the folder guide ↗Comparison tools
Find a Mac comparison workflow.
Choose a guide for the tool or task you are evaluating.
Review source files, differences and results together.
MergeDock keeps source files, difference navigation, merge actions, encoding controls and history in one place, so you can review changes, edit the result and reopen recent comparisons without switching between separate tools.
Three ways to use MergeDock
Start with the change in front of you.
Resolve conflicts with context.
Review BASE, LOCAL and REMOTE, then save the resolved result to MERGED. Check the repository state separately in Git.
Review folder changes before applying them.
Inspect differences and a sync plan before changing files. Executing Folder Sync requires Pro.
01 / TEXT
See exactly what changed.
Synchronized panes, line and inline highlights, search, navigation, editing and encoding controls let you review a change and correct it in the same flow.
- Two-way comparison with apply-left and apply-right operations
- Search across panes with current and all-match highlighting
- Encoding and line-ending inspection with explicit refresh
02 / FOLDERS
Review folder differences in one list.
Compare nested folders, narrow the results, check metadata and open any file for a closer look. MergeDock asks before copy or delete operations change anything on disk.
- Clear states for identical, modified, one-sided and type-mismatch items
- Reusable comparison presets for source trees
- File and folder operations with explicit confirmation
03 / VISUAL
Compare images in five viewing modes.
Check dimensions and pixel differences with side-by-side, overlay, slider, blink and difference views. Zoom and pan stay neatly inside the comparison area.
- Multiple visual modes for different inspection tasks
- Dimension and pixel-level mismatch status
- Binary comparison for non-text files
04 / MERGE
Resolve conflicts while viewing base, left and right.
Base, left and right inputs stay synchronized with the merge result and conflict detail. Choose one side, combine both or edit the resolved result while the surrounding change remains visible.
- Manual three-way merge for any selected files
- Git difftool and mergetool integration
- Unresolved regions remain protected until a resolution is chosen
Made for everyday comparison work
Tools for detailed comparison work.
Scale-aware text engine
Small files remain fully interactive. Large text files use indexed access, so you can inspect the visible area without loading the entire document into the interface.
Encoding & line-ending control
Check detected encodings, compare line endings and refresh how the current in-memory text is interpreted whenever you need to.
History, recovery & safe saves
Reopen recent comparisons, pin important sessions, notice external edits and restore the original file when an interrupted or failed save leaves recovery data.
Keyboard-first navigation
Move between differences, page through a file, jump to the beginning or end, search and refresh while keeping your focus on the comparison.
Review, edit and merge
Review source files, differences and results together.
One comparison workspace
Review source files, differences and results together.
Access only where you allow
MergeDock asks before accessing the files and folders you choose, and remembers that access only where macOS allows.
No ads or tracking
The app does not include advertising SDKs or cross-app tracking.
Data you can manage
Settings, history, recovery data and access bookmarks remain in the app environment, with controls available inside MergeDock.
A straightforward workflow
Open, review, resolve and save.
Open what you want to compare
Choose files or folders, or start from Git. MergeDock opens the comparison that fits the selected content.
Review changes in context
Navigate differences with synchronized panes, overview bars, detail views, search and keyboard commands.
Resolve and save
Apply changes from either side, edit where allowed, review external changes and save when the result is ready.
Check the saved result
Confirm the destination after saving or syncing. If Git opened the comparison, also verify the repository state in Git.
Two-way text comparison
Two-way comparison with apply-left and apply-right operations
Read the file comparison guide ↗Resolve conflicts with context.
Review BASE, LOCAL and REMOTE, then save the resolved result to MERGED. Check the repository state separately in Git.
Read the Git guide ↗Review folder changes before applying them.
Inspect differences and a sync plan before changing files. Executing Folder Sync requires Pro.
Read the folder guide ↗Free and Pro
Start free. Upgrade to Pro when you need more.
Core comparison and merge features are free. Pro unlocks advanced image comparison, Folder Sync execution and other additional features. Check the in-app purchase screen for current pricing in your region.
| Feature | Free | Pro |
|---|---|---|
| Basic file comparison | FreeIncluded | ProIncluded |
| 2Way editing and 3Way merge | FreeIncluded | ProIncluded |
| Git difftool & mergetool | FreeIncluded | ProIncluded |
| Folder sync preview | FreeIncluded | ProIncluded |
| Folder Sync execution | FreeRequires Pro | ProIncluded |
| Advanced image comparison | FreeRequires Pro | ProIncluded |
| AI assistance with Apple Intelligence | FreeRequires Pro | ProIncluded |
| Comparison history | FreeBasic history | ProExpanded history |
Pro is a one-time in-app upgrade that unlocks additional features, including Folder Sync execution and advanced image comparison.
AI assistance requires Pro, macOS 26 or later, a compatible Mac with Apple silicon, and Apple Intelligence enabled. Image AI requires macOS 27 or later.
Check the App Store and the in-app purchase screen for availability and current pricing in your region.
FAQ
A few things to know before you begin
Which macOS versions are supported?
MergeDock requires macOS 15 or later and is distributed through the Mac App Store.
A save did not complete successfully
If an unexpected termination or write error leaves recovery data, open Recovery Center from Settings > Recovery and Storage to review it. Edits explicitly discarded when closing a comparison cannot be recovered.
Can I use it with Git?
Yes. MergeDock can be configured as a Git difftool and mergetool while remaining compatible with the Mac App Store sandbox model. If you are moving from WinMerge, the side-by-side comparison workflow will feel familiar.
How does the free version differ from Pro?
Core comparison and merge features are free. Pro unlocks advanced image comparison, Folder Sync execution and other additional features. Check the in-app purchase screen for current pricing in your region.
Is Folder Sync preview the same as execution?
No. The preview shows the planned file operations. Folder Sync execution requires Pro and starts only after you choose the operations and confirm them.
Get MergeDock for macOS
Get MergeDock from the Mac App Store and keep text, folder, image and merge work together in one focused app.