← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_subsume.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_subsume.py
22
22
    def make_branch_and_tree(self, relpath, format=None):
23
23
        if format is None:
24
24
            format = 'dirstate-with-subtree'
25
 
        return tests.TestCaseWithTransport.make_branch_and_tree(self, relpath, 
 
25
        return tests.TestCaseWithTransport.make_branch_and_tree(self, relpath,
26
26
                                                                format)
27
27
 
28
28
    def make_trees(self, format=None, same_root=False):