← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
127
127
        transform_tree(tree, tree.branch.basis_tree())
128
128
 
129
129
    def test_ignore_zero_merge_inner(self):
130
 
        # Test that merge_inner's ignore zero paramter is effective
 
130
        # Test that merge_inner's ignore zero parameter is effective
131
131
        tree_a =self.make_branch_and_tree('a')
132
132
        tree_a.commit(message="hello")
133
133
        dir_b = tree_a.bzrdir.sprout('b')