Skip to content
HALOWERK

Textwerk

three way text merge

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. A region changed on one side only takes that side, a region changed identically on both sides is taken once (false conflict), otherwise a conflict is emitted with markers <<<<<<< ours, ||||||| base (diff3 style), ======= and >>>>>>> theirs (labels configurable). Units are.

POST https://text.halowerk.com/v1/three-way-text-merge

Inputs

Fields of the published input schema
FieldTypeRequiredDescription
basestringYes
oursstringYes
theirsstringYes
unitstringNo
conflict_stylestringNodiff3 includes the base section in conflicts.
labelsobjectNo
Show full input schema
{
  "type": "object",
  "additionalProperties": false,
  "required": [
    "base",
    "ours",
    "theirs"
  ],
  "properties": {
    "base": {
      "type": "string",
      "maxLength": 1000000
    },
    "ours": {
      "type": "string",
      "maxLength": 1000000
    },
    "theirs": {
      "type": "string",
      "maxLength": 1000000
    },
    "unit": {
      "type": "string",
      "enum": [
        "line",
        "sentence"
      ],
      "default": "line"
    },
    "conflict_style": {
      "type": "string",
      "enum": [
        "diff3",
        "merge"
      ],
      "default": "diff3",
      "description": "diff3 includes the base section in conflicts."
    },
    "labels": {
      "type": "object",
      "additionalProperties": false,
      "properties": {
        "ours": {
          "type": "string",
          "maxLength": 60
        },
        "base": {
          "type": "string",
          "maxLength": 60
        },
        "theirs": {
          "type": "string",
          "maxLength": 60
        }
      }
    }
  }
}

Open original schema

Published input example

{
  "base": "a\nb\nc\n",
  "ours": "a\nB\nc\n",
  "theirs": "a\nb\nC\n"
}

Result & documentation

Machine-readable documentation of this hub

Source of this page: the published HALOWERK catalog. Updated: 2026-11-17 UTC.

More endpoints in this hub

All endpoints in this hub →