120
124
regions produce conflicts.
123
def __init__(self, lines_a, lines_b, a_marker=TextMerge.A_MARKER,
127
def __init__(self, lines_a, lines_b, a_marker=TextMerge.A_MARKER,
125
129
split_marker=TextMerge.SPLIT_MARKER):
126
130
TextMerge.__init__(self, a_marker, b_marker, split_marker)
137
142
for ai, bi, l in sm.get_matching_blocks():