Text Diff, Compare & Merge Tool

Text Diff Pro

Comparison Settings

Ignore whitespace

Ignore case

Ignore line endings

Character-level diff

Auto-merge simple conflicts

0/0

Original / Left

Modified / Right

Base / Common Ancestor

Left / Ours

Right / Theirs

Merged Result

Getting Started

Text Diff Pro is a powerful tool for comparing and merging text. Here's how to use it:

Enter or paste text into the Original and Modified panels
Or drag & drop files directly into the panels
Click Compare to see differences

Keyboard Shortcuts

Ctrl + O - Open file
Ctrl + S - Save result
Ctrl + C - Copy selected text
Ctrl + V - Paste from clipboard
Ctrl + F - Search in diff
Ctrl + Z - Undo
Ctrl + Y / Ctrl + Shift + Z - Redo
Ctrl + Enter - Compare
F3 - Find next
Shift + F3 - Find previous

View Modes

Side-by-Side: See both versions next to each other (default)
Inline: See changes in a single column with old/new line numbers
Unified: Classic diff format with @@ markers

Merge Controls

When comparing, you can merge individual changes:

◀ - Accept left/original version
▶ - Accept right/modified version
◀▶ - Keep both (concatenate)

Three-Way Merge

For resolving conflicts when merging branches:

Enter the Base version (common ancestor)
Enter Your changes (left/ours)
Enter Their changes (right/theirs)
Click Auto-Merge to automatically resolve simple conflicts

Comparison Settings

Ignore whitespace: Ignore spaces and tabs when comparing
Ignore case: Case-insensitive comparison
Ignore line endings: Treat CRLF and LF as equal
Character-level diff: Highlight specific character changes within lines

Export Options

HTML Report: Full visual diff with styling
Unified Diff: Standard patch format
JSON: Structured diff data
Markdown: Diff formatted as markdown