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)
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 |