← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

Remove unused line from test case

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
404
404
        tree_a.commit('', rev_id='rev3a')
405
405
        tree_b.commit('', rev_id='rev3b')
406
406
        graph = tree_a.branch.repository.get_graph(tree_b.branch.repository)
407
 
        result = graph.find_unique_lca('rev3a', 'rev3b', count_steps=True)
408
407
        out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
409
408
        self.assertContainsRe(err, 'Warning: criss-cross merge encountered.')