Commit 348fdbb8 authored by Kai Willadsen's avatar Kai Willadsen

vc.git: Add docstring explaining the idea of the diff3 re-merge

parent 992c0498
......@@ -186,6 +186,13 @@ class Vc(_vc.Vc):
runner(command, files, refresh=True, working_dir=self.root)
def remerge_with_ancestor(self, local, base, remote):
"""Reconstruct a mixed merge-plus-base file
This method re-merges a given file to get diff3-style conflicts
which we can then use to get a file that contains the
pre-merged result everywhere that has no conflict, and the
common ancestor anywhere there *is* a conflict.
proc ="merge-file", "-p", "--diff3", local, base, remote)
vc_file = StringIO.StringIO(
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment