/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

  • Committer: Robert Collins
  • Date: 2006-09-17 21:03:04 UTC
  • mfrom: (2018 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2019.
  • Revision ID: robertc@robertcollins.net-20060917210304-3a697132f5fb68ac
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')