3-Way Text Merge
Free 3-way text merge with no upload. Paste base, ours, and theirs, or a raw git conflict block, and resolve only the true conflicts.
Files never leave your browser.
Paste a git conflict block
Paste output from a git merge conflict (with <<<<<<<, =======, >>>>>>>, optionally ||||||| for the base). The tool will split it into the three panes above.
About 3-way Text Merge
Three-input text merge with conflict detection: base + ours + theirs. Mirrors git merge semantics for unstructured text and accepts pasted git-conflict marker blocks for one-click splitting.
How to use
- Paste the common ancestor into the base editor.
- Paste both edited versions, or paste a raw git-conflict marker block and click Split to populate all three sides.
- Resolve each conflict hunk by picking Ours, Theirs, or Both.
Try a sample
A short function rewritten differently on each side from a common base.
What this tool doesn't handle
- Whole-line resolution only. No inline word picking within a conflict.
- Three-way merge requires the original base version; pure two-way conflicts should use Text Merge.
Frequently asked questions
Do my files ever leave my browser?
No. Every comparison runs locally in your browser. Nothing you paste, drop, or load is uploaded to a server; the tool keeps working even if you go offline after the page loads.
Is this tool free to use?
Yes. All DiffResolver tools are free, with no account, sign-up, or installation. Because processing happens on your device, there are no server-imposed usage limits.
Can I paste a git conflict directly?
Yes. Paste a block containing git conflict markers (<<<<<<<, =======, >>>>>>>) and click Split into panes; base, ours, and theirs are then populated automatically.
Why do I need a base version?
The base tells the tool which side changed each line. Edits made on only one side apply automatically; only lines changed on both sides become conflicts you have to resolve by hand.
What does choosing Both do when resolving a conflict?
It keeps both sides' lines, ours first followed by theirs. That is useful when each side added different content in the same place and you want all of it.
Is there a file size limit?
No server limit applies, because nothing is uploaded. The memory of your device sets the practical limit. Above 10 MB for text, 40 MB for images, 100 MB for documents, or 500 MB for archives, the tool warns you that the work can be slow, but it never blocks the file.
Does this tool work offline?
Yes. The browser keeps a copy of the tool after the first visit, so a page you opened before still works without a network. You can also install DiffResolver as an app from the browser menu. Installation stays optional; the site works the same in a normal tab.
Where is my data stored?
Your files are stored nowhere. They stay in the memory of the page and are gone when you close the tab. Only what you save yourself stays in this browser: a snapshot, your tool options, and your theme. To remove it, open Settings and select Clear all local data.