440
441
yield 'unchanged', '' # terminator
442
443
def weave_merge(self, plan, a_marker='<<<<<<< \n', b_marker='>>>>>>> \n'):
446
def struct_to_lines(self, struct_iter, a_marker, b_marker):
447
def __init__(self, plan, a_marker='<<<<<<< \n', b_marker='>>>>>>> \n'):