Utilidades para desarrolladores

Three-Way Diff Viewer

Paste a base version plus two edits and see conflicts, one-sided changes, and auto-merge candidates.

Browser-onlyInstant outputLocal data

Por qué usar esta herramienta

03

Line-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.

Cómo usarla

03
01Paste the common base version in the first box.
02Paste your version and the other branch's version in the next two.
03Review the colored diff table and the auto-merged preview at the bottom.

Revisiones rápidas antes de copiar

03

Confirm 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.

Preguntas frecuentes

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.

Herramientas relacionadas

03

Regex Tester

Test regular expressions with live match highlighting and capture group table.