Overview
Merge two edited versions of a text against their common base (diff3): non-overlapping changes are combined automatically, overlapping ones become conflicts with git-style markers, by line or by sentence. Implements the diff3 merge (Khanna, Kuber and Pierce 2007, "A Formal Investigation of Diff3"): base-ours and base-theirs are compared with Myers diffs; changed base ranges of both sides that overlap or touch form a region.
Protocol
x402 (POST)
Price
$0.0030
Payment Asset
USD Coin
Payment Network
eip155:8453
Category
uncategorized
Provider
text
Indexed
2026-11-21 09:10:14
Health
Status
unknown
Latency (p50)
—
Uptime (30d)
—
Reliability Score
—
Last Checked
Never
Last Healthy
Never
Consecutive Failures
0
Input Schema
{
"body": {
"base": "a\nb\nc\n",
"ours": "a\nB\nc\n",
"theirs": "a\nb\nC\n"
},
"bodyType": "json",
"method": "POST",
"type": "http"
}
Output Schema
{
"example": {
"limitations": [
"Textual merge only: two changes that do not overlap textually but contradict each other in meaning are merged silently.",
"Ambiguous alignments can be resolved differently from other diff tools."
],
"result": {
"clean": false,
"conflicts": [
{
"base": "b\nc\n",
"base_range": [
1,
3
],
"index": 0,
"ours": "B\nc\n",
"ours_range": [
1,
3
],
"output_unit": 2,
"theirs": "b\nC\n",
"theirs_range": [
1,
3
]
}
],
"merged": "a\n<<<<<<< ours\nB\nc\n||||||| base\nb\nc\n=======\nb\nC\n>>>>>>> theirs\n",
"method": "diff3 over Myers diffs (Khanna, Kuber, Pierce 2007)",
"stats": {
"auto_merged_regions": 0,
"conflicts": 1,
"identical_changes": 0,
"units": {
"base": 3,
"ours": 3,
"theirs": 3
}
},
"unit": "line"
},
"service": "three-way-text-merge",
"status": "success"
},
"type": "json"
}