Merge Text
Merge two versions of a text online. Review each difference side by side, keep the wording you prefer, and export the combined result. Free, with no upload.
Files never leave your browser.
About Text Merge
Walks through the differences between two versions of a text file and lets you pick, hunk by hunk, which side to keep. Useful for resolving simple two-way conflicts or assembling a release from two drafts.
How to use
- Paste your two versions into the left and right editors.
- For each highlighted hunk, click the left or right button to keep that side's wording.
- Copy the merged result when every hunk is resolved, or download it as a file.
Try a sample
Two release-note drafts with overlapping bullet edits. A realistic case for picking sides.
What this tool doesn't handle
- Two-way merge has no notion of a shared ancestor. If you need true conflict resolution from a git checkout, switch to 3-way Text Merge instead.
- Whole-line hunks only: you cannot pick individual words from each side within the same line.
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.
What is the difference between Text Merge and 3-way Text Merge?
Text Merge combines two versions by letting you pick a side for each differing hunk. 3-way Text Merge adds the common ancestor as a third input, which lets non-conflicting edits apply automatically, like a git merge.
Can I keep wording from both versions in the same hunk?
No. Each hunk is resolved to one whole side. Pick the side that is closer to what you want, then fine-tune the exported result in your editor.
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.