/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Switched from actual, expected to expected, actual, for John.

Show diffs side-by-side

added added

removed removed

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