emacs_ediff_3way
Resolve merge conflicts by comparing local, remote, and ancestor file versions. Choose unified or merge output for a clear three-way diff.
Instructions
Three-way comparison of files (useful for merge conflicts)
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": {
"file_a": "<file_a>",
"file_b": "<file_b>",
"file_ancestor": "<file_ancestor>"
},
"name": "emacs_ediff_3way"
}
}Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| file_a | Yes | Path to the first file (mine/local) | |
| file_b | Yes | Path to the second file (theirs/remote) | |
| format | No | Output format (default: unified) | |
| file_ancestor | Yes | Path to the ancestor/base file |