Mac file comparison and merge

Resolve complex changes clearly.

Native diff and merge for macOS — compare text, images, video, folders, and Mach-O binaries with precision.

Native macOS • No file uploads • Local-first

ABDiff three-way merge view on macOS

Visual merge

Resolve conflicts in place.

ABDiff opens a visual 3-way merge view with Local, Result, Remote, and Base context.

Resolve with Ours or Theirs, copy selected lines to Result, or edit the Result pane directly.

  • Result is the only editable pane
  • Right-click conflict actions
  • Save the Result file to finish the merge
ABDiff right-click merge actions on macOS

What is ABDiff?

A diff and merge tool that goes beyond code.

ABDiff is a macOS diff and merge tool for text, images, video, folders, and Mach-O binaries, with Git integration and local workflows.

Built for developers who need precision, not just differences.

Core workflows

Built for real diff and merge workflows

Text diff, merge, and Git workflows come first. Visual and binary comparison extends the same review model.

Text Diff & Merge

Two-way diff and three-way merge with deliberate editing and review.

  • Word-level highlighting
  • Connector layout
  • Hunk-based editing
  • Patch export

Git & Workflow Integration

Use ABDiff from Git, the terminal, and editor workflows.

  • git difftool
  • git mergetool
  • Revision loading
  • CLI automation

Folder Comparison

Compare directory trees with project-scale context.

  • Relative path alignment
  • Change classification
  • Copy and cleanup actions
  • Shared ignore rules

Compare changes with clarity.

Unified, side-by-side, or connector layouts.

Word-level highlighting inside changed lines

Works with git difftool and mergetool

See visual differences instantly.

Includes alignment strategies, zoom, and pan for precise inspection.

Split and crossfade for human review

SSIM analysis

ABDiff image comparison view on macOS

Compare video frame by frame.

Ideal for visual regression, rendering validation, and motion checks.

Side-by-side or split comparison

Frame-by-frame inspection

ABDiff synchronized video comparison on macOS

See project changes at a glance.

Designed for real project diffs, not toy examples.

Relative path alignment

Expandable change navigation

ABDiff folder comparison view on macOS

Inspect Mach-O differences structurally.

Structured, read-only comparison of Mach-O binaries.

Slice-aware inspection

Flag potential private API usage

ABDiff Mach-O comparison view on macOS

FAQ

Common questions about ABDiff

Short answers about file types, Git workflows, image review, and local privacy.

What kinds of files can ABDiff compare on macOS?

ABDiff compares text files, images, videos, folders, and Mach-O binaries on macOS. It also supports merge workflows for text and includes a command-line tool for Git and other integrations.

Does ABDiff work with git difftool and git mergetool?

Yes. ABDiff can be configured as a Git difftool and mergetool through the abd command-line tool, including three-way merge workflows for conflicted files.

Does ABDiff support 3-way merge on macOS?

Yes. ABDiff supports three-way merge for text files on macOS, with explicit conflict regions, a result-focused editing model, and Git mergetool integration for conflicted files.

Can ABDiff run from the command line or in CI workflows?

Yes. ABDiff includes the abd command-line tool for launching comparisons from scripts, terminal workflows, IDEs, and Git. It also supports CI-style image comparison with metrics and exit codes.

Does ABDiff upload my files or use telemetry?

ABDiff is designed for local review on macOS. It does not operate a developer backend for document processing, does not upload your files to the developer, and does not use developer telemetry.

FAQ

Comparisons

Compare ABDiff with other diff tools

See how ABDiff differs from Kaleidoscope, Beyond Compare, and Araxis Merge.

COMMON USE CASES

  • Git difftool and mergetool workflows
  • Reviewing pull request changes locally
  • Visual regression testing for images
  • Comparing rendered video outputs