← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Add WorkingTree.add_conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
144
144
    def test_merge_inner_conflicts(self):
145
145
        tree_a = self.make_branch_and_tree('a')
146
146
        tree_a.set_conflicts(ConflictList([TextConflict('patha')]))
147
 
        merge_inner(tree_a.branch, tree_a, tree_a, tree_a)
 
147
        merge_inner(tree_a.branch, tree_a, tree_a, this_tree=tree_a)
148
148
        self.assertEqual(len(tree_a.conflicts()), 1)