What inputs are required?

Branch A and Branch B are required. A Base / ancestor text is needed for three-way merge mode.

What comparison levels are supported?

You can compare text by lines, words, or characters.

Can the comparison ignore case or whitespace?

Yes. Enable Ignore case or Ignore whitespace before running the comparison.

How are three-way conflicts shown?

Conflicts are marked with Git-style conflict markers so you can review both branch changes.

What does Patch mode produce?

Patch mode produces a unified patch describing the changes from Branch A to Branch B.

Elysia Tools

Navigation

Text Processing

Three-Way Text Comparison & Merge Suite

Line/word/char diff with ignore rules, three-way merge with conflict markers, and unified patch

Details

What this tool helps you do

Compares two texts at line, word, or character granularity with optional case/whitespace ignoring, performs a three-way merge of two branches against a common ancestor (marking conflicts Git-style), and emits a unified patch. Based on jsdiff (LCS). Pure local — no AI, no network.

Execution

Run this tool

Fill in the form, run the tool, and review the result in one place.

Prepared example runs

Click an example to fill the form automatically. File inputs still need an upload.

2 examples

Three-way merge with a clean combine

Both branches edit different parts of the base; the tool merges them with zero conflicts.

{
  "type": "html"
}

Two-way line diff (A vs B)

A straightforward line-level diff between two text blocks, showing additions and removals.

{
  "type": "html"
}

Inputs

Set the required fields, then run the tool.

8 options

ContentPaste or type the main input values.3

Base / ancestor (O)textareaOptionalBranch A (ours)textareaRequiredBranch B (theirs)textareaRequired

SettingsAdjust formats, ranges, numbers, and modes.3

ModeselectOptionalGranularityselectOptionalContext linesnumberOptional

TogglesEnable or disable optional behavior.2

Ignore casecheckboxOptionalEnabled when checkedIgnore whitespacecheckboxOptionalEnabled when checked

Result

Ready for a run

Run the tool to preview files, text, structured data, or streamed output here.

Samples

Three-Way Text Comparison & Merge Suite

What this tool helps you do

Run this tool

Prepared example runs

Inputs

Result

Examples that match this tool

Continue with connected tools and hubs

Prepared example runs

Inputs

Result

Learn when to use this tool, what it supports, and how real users apply it.

Key facts

Overview

When to use

How it works

Use cases

Examples

1. Combine independent branch edits

2. Review a line-level text revision

FAQ

Text with Emoji Samples

Truffle Development Suite Samples

Chinese-English Mixed Text Samples

Text Case Format Samples

Advanced Duplicate Line Remover

Remove Duplicate Lines

Text Repeater

Whitespace Normalizer

Text Case, Encoding, and Normalization Conversion Tools

Text Tools

Text Analysis, Readability, and Content Inspection Tools

Text Redaction, Highlighting, and Presentation Formatting Tools