Text Diff & 3-Way Merger

Three-way merge tool: paste base text, version A, and version B. Highlights conflicts and lets you click to resolve.

Base (Original)

Version A

Version B

0/2 conflicts resolvedResolve all conflicts below to get a clean merge

Conflict 1

Version A

  console.log("Hi, " + name + "!");

Version B

  console.log("Hello, " + name + ".");

Conflict 2

Version A

function multiply(a, b) {

Version B

greet("Everyone");

Merged Output

function greet(name) {
<<<<<<< Version A
  console.log("Hi, " + name + "!");
=======
  console.log("Hello, " + name + ".");
>>>>>>> Version B
}

function add(a, b) {
  return Number(a) + Number(b);
}

<<<<<<< Version A
function multiply(a, b) {
=======
greet("Everyone");
>>>>>>> Version B
  return a * b;
}

greet("World");

How to Use Text Diff & 3-Way Merger

1

Paste both versions

Enter the original text and the modified version.
2

Review the diff

See changes highlighted as additions, deletions, and modifications.
3

Merge selectively

Choose which changes to accept or reject in the final output.
4

Copy merged text

Click copy to grab the merged result.