Developer Utilities
Three-Way Diff Viewer
Paste a base version plus two edits and see conflicts, one-sided changes, and auto-merge candidates.
Conflicts
Auto-merged
Unchanged
Lines
| # | Base | Yours (A) | Theirs (B) |
|---|
Why use this tool
03Line-aligned three-way diff visualizer with conflict highlighting, per-line classification, and an auto-merged preview with <<<<<<<>>>>>>> markers for conflicts.
Three-Way Diff Viewer helps spot merge conflicts before you push or when reviewing someone else's rebase.
Each line is classified as unchanged, changed in A only, changed in B only, both-identical, or conflict.
How to use
03Quick checks before you copy
03Confirm the input is the format you intended.
Scan the result before using it in a document, URL, config, or message.
Copy only the output you need.
FAQ
03
Does it work like git merge?
It aligns lines by index for clarity. Real git merges use LCS with insertion/deletion — use this for quick visual triage, not a full merge replacement.
How are conflicts marked?
Conflicts appear with <<<<<<< A / ======= / >>>>>>> B markers in the merged output, matching the familiar git format.
Does it store my text?
No. Everything runs in this tab and nothing leaves your browser.
Related tools
03JSON Formatter→
Format, minify, and validate JSON in one place.
Regex Tester→
Test regular expressions with live match highlighting and capture group table.
JSON Schema Generator→
Infer a JSON Schema from a sample JSON document, with draft selection and required policies.