three_way_merge
Perform a three-way merge of base, ours, and theirs. Conflicts are marked with standard diff3 conflict markers.
Tool call template
Replace each placeholder with a value matching the input schema. Only required parameters are included; add optional parameters as needed.
{
"id": 1,
"jsonrpc": "2.0",
"method": "tools/call",
"params": {
"arguments": {
"base": "<base>",
"ours": "<ours>",
"theirs": "<theirs>"
},
"name": "three_way_merge"
}
}Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| base | Yes | Common ancestor text | |
| ours | Yes | Our version of the text | |
| theirs | Yes | Their version of the text | |
| ours_label | No | Label for ours in conflict markers (default "ours") | |
| theirs_label | No | Label for theirs in conflict markers (default "theirs") |