When a two-way merge is the right tool
Use it when you have two edited copies of the same text and want one final version: two reviewers' edits to a press release, a teammate's changes to shared notes, or an old and new version of a template where you want to keep some of each. It shows every difference as a choice rather than guessing, so nothing is dropped silently.
Default choice for each difference is B (the right side). Pick A, or keep both in either order. To just see the differences, the text compare is quicker.
Questions
How does merge text work?
The two versions are diffed line by line. Every place where they differ becomes a "hunk". For each hunk you choose the left version, the right version, or both, and the merged text updates as you go. Unchanged lines are kept automatically.
Is this a three-way merge like git?
No, it is a two-way merge: you decide each difference yourself. A three-way merge also needs the common ancestor version to decide automatically which side changed; that is what git merge does.
Can I edit the merged result?
Yes. Copy it, or click "Edit result" to fine-tune the merged text by hand before copying or downloading it.
Is my text private?
Yes, all merging happens in your browser.