Three-Way Text Merge & Conflict Viewer
Paste the base, your version and the incoming version. Review conflict markers in the merged text before copying or downloading it.
Runs locally in your browser1Common base2Merge text3Merged text
Paste the base, your version and the incoming version. Review conflict markers in the merged text before copying or downloading it.
Runs locally in your browser
Three-Way Text Merge belongs to the text utilities on KivTools. The workbench above handles the whole job on one screen: text you paste or type, then a text result you can copy.
The conversion runs inside the page with browser JavaScript. Nothing you enter is uploaded, the tool keeps working offline, and it is safe for data you are not allowed to send to a third party.
Text work looks trivial until encodings, invisible characters and locale rules appear. These utilities normalise, count or rewrite strings deterministically, so the result is the same on every machine instead of depending on a word processor’s habits.
The classic failure is an invisible difference: a non-breaking space, a smart quote or a Windows line ending that survives a copy-paste and breaks the next tool in the chain. When two strings look identical but behave differently, compare their characters, not their appearance.
Browsers, desktop tools and command-line utilities should agree on the result; a mismatch usually means a different encoding, locale or version. Check the result on a sample that contains the awkward cases you care about — accents, emoji, right-to-left text or trailing whitespace — instead of only on a plain sentence.
Case conversion and sorting are locale-aware in some languages: Turkish dotless i, German sharp s and French accents all have rules that a naive ASCII implementation ignores. Keep a copy of the input while you experiment, so a wrong setting never destroys the source.
Yes. Every tool on KivTools is free, needs no account and has no usage quota. There is no paid tier hiding behind the workbench, and no email address is required to use the result.
Inside your browser. The page loads a script once and the conversion happens on your machine, which is also why the tool still works when the network drops.
The workbench takes text you paste or type and returns a text result you can copy. Large inputs are usually handled without trouble, but extremely large ones are better processed in a local command-line tool.
Compare characters, not looks: invisible differences are what break the next step. Compare a small known-good sample first when the output feeds an automated pipeline.
The output is yours: no watermark, no licence tag, no attribution requirement. Check the underlying format or library licence when the result ships in a product.
The page works in any modern mobile browser, and the layout collapses to a single column on small screens. Local tools keep working offline once the page has loaded.