Problem solved by Diff Anything macOSWindows

Merge two edited copies with their original as the base

A KDiff3 alternative for Mac: combine independent text changes, resolve conflicts and save the merged file locally with Diff Anything Pro.

See it in the app

Two edited plans, one original and a merged result to review.

No accounts, cloud comparison service, analytics, or telemetry.

Diff AnythingLooking for KDiff3 on your Mac? Here's how to merge two edited copies of a text file with the original they both came from, with Diff Anything: changes on different lines, and even different words of the same line, merge on their own, and you choose a side for each conflict. No Git or command line needed. Watch on YouTube

The problem

Why the usual workflow gets in the way.

You changed your copy of a file. A teammate changed theirs. Comparing the two shows differences, but you need the original to work out which changes to keep.

The solution

How Diff Anything handles it.

Open both copies in Diff Anything Pro and select their common original. Independent changes merge automatically, including edits to different words on the same line. Choose how to resolve each conflict, review the editable result and save. Your files stay on your Mac, with no AI involved.

01 / Three-way text merge

Keep the changes that work together

In the tutorial, you and Sara each edited a team offsite plan. Your copy changes the start time; Sara’s changes lunch. Those independent changes merge automatically.

Both copies also change the packing line, but different words: one adds a charger, the other changes the jacket. Both edits fit in the result. Competing changes to dinner stay as a conflict for you to decide.

02 / Three-way text merge

Choose a side or edit the result yourself

At the top, each version is compared with the original. Below is the editable result. For each conflict, accept ours, accept theirs, keep both in either order or use the base.

The tutorial accepts Sara’s dinner time. Replace right with merged result puts the resolved text in the right-hand copy; saving writes that file. Keep the original and both copies until you have checked the saved result.

03 / Three-way text merge

A file merge directly on your Mac

KDiff3 compares and merges two or three text files or folders. KDE lists macOS and Windows builds alongside Linux. This guide demonstrates Diff Anything’s own file-merge workflow on Mac.

This workflow starts in the app and does not need Git or a command line. If a Git merge has stopped with conflicts, use the separate git mergetool guide linked below. Diff Anything is not affiliated with KDiff3 or KDE.

04 / Three-way text merge

Three-way merging requires Pro

Three-way merge is part of Advanced tools in Diff Anything Pro. The demonstration uses Pro to merge the files and resolve the conflict.

A Free text comparison allows files up to 5 MB each and 10 new comparison sessions per local day. Comparing two files shows their differences; the three-way merge workflow shown here requires Pro.

Clear answers

Common questions about KDiff3 alternative for Mac.

Do I need the original file?

Yes. Choose the common original both edited copies started from as the merge base. Comparing only the two edited copies cannot tell which changes were made since that original.

Can changes on the same line merge automatically?

Yes, when they affect different words and do not compete. Competing edits remain as conflicts for review; the editable result lets you make the final decision.

Can I use the three-way merge for free?

The three-way merge is part of Advanced tools and requires Diff Anything Pro.

Do I need Git?

No. This guide starts with Compare two files and opens the merge through Tools. Git users can follow the separate git mergetool guide.

Are my files uploaded?

No. The merge runs locally on your Mac, and none of your file data is sent to an AI model.

Three short steps

Compare the copies, select the original and resolve the conflict.

  1. 01

    Choose Compare two files and open your copy first, then the other copy.

  2. 02

    Open Tools and choose Three-way merge. The left file is ours and the right file is theirs. Select merge base, choose the original both copies started from, then choose Merge. This tool requires Pro.

  3. 03

    Review the automatic changes and resolve each conflict. When the result is ready, choose Replace right with merged result, then save. Review and confirm the overwrite if prompted.

Available for macOS and Windows

Solve it with Diff Anything.