class documentation
Merge driver that runs an external process.
| Method | __init__ |
Initialize process merge driver. |
| Method | merge |
Perform merge using external process. |
| Instance Variable | command |
Undocumented |
| Instance Variable | name |
Undocumented |
def merge(self, ancestor:
bytes, ours: bytes, theirs: bytes, path: str | None = None, marker_size: int = 7) -> tuple[ bytes, bool]:
¶
Perform merge using external process.
The command is executed with the following placeholders: - %O: path to ancestor version (base) - %A: path to our version - %B: path to their version - %L: conflict marker size - %P: original path of the file
The command should write the merge result to the file at %A. Exit code 0 means successful merge, non-zero means conflicts.