Text Merge
Merge two versions change by change, or three-way from a common original with conflicts to settle, then edit and save the result.
11 lines · LF
12 lines · LF
About this tool
Merge two versions of a text change by change: start from the original and, for each change, keep the original, take the new version or keep both. Undo and redo your choices, then edit the result by hand if you need to.
With a common original, merge three ways, as version control does: changes made in only one version are taken automatically, the same change in both is taken once, and where both versions changed the same or neighbouring lines differently, you choose A, B, both or the original.
Download the result with its line endings kept or made consistent. Conflicts you haven’t settled are written with Git-style markers, so nothing is lost silently. Everything stays on your device.
What counts as a conflict?
When both versions changed the same lines of the original, or lines right next to each other, in different ways. Identical changes in both versions aren’t conflicts.