Skip to main content

Text Diff & Merge

v1.0.2

Three-way text diff and merge with conflict detection and color-coded output.

Side-by-side text diff viewer that highlights added, removed, and changed lines between two text inputs, with line-level and word-level diff modes and a 3-way merge panel for resolving conflicts.

How to use
  • Paste the original text in the left panel and the modified text in the right panel, then click Diff.
  • Toggle between line diff and word diff mode using the toolbar — word mode shows inline changes within lines.
  • Use the 3-way merge panel to paste a third base version and resolve conflicting changes manually.
  • Copy the merged output or download it as a .patch file to apply with git apply.
Base (Original)
Left (Theirs)
Right (Yours)