158
158
merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
159
159
this_tree=tree_b, ignore_zero=True)
163
163
merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
164
164
this_tree=tree_b, ignore_zero=False)
167
167
def test_merge_inner_conflicts(self):
168
168
tree_a = self.make_branch_and_tree('a')