Merge two sets of edits that started from the same document. Changes only one side made are applied for you; where both sides changed the same lines, the chunk is marked as a conflict for you to resolve. The page opens on a sample, and nothing is uploaded.
Free, with no sign-up and no install.
A merge of two edited copies of a document against the common ancestor they both came from. Knowing the original is what lets the tool apply a change one side made on its own, and flag only the lines both sides rewrote.
Conflicting chunks are highlighted and counted, and you can jump from one to the next. For each one, take the left side, take the right side, or edit the merged result directly — undo and redo work throughout.
No. Paste or drop in any three versions of a text — a document, a config file, a translation. Git is one place three-way merges come from, not a requirement.
No. The merge is computed in your browser and the files never leave your device, which is why this works for source code, contracts and config you cannot paste into a hosted tool.
JavaScript must be enabled to use the tool.