← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Reconcile NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
469
469
 
470
470
    def setUp(self):
471
471
        TestCaseWithMemoryTransport.setUp(self)
472
 
        self.vf = knit.KnitVersionedFile('root', self.get_transport(),
473
 
                                         create=True)
 
472
        self.vf = knit.make_file_knit('root', self.get_transport(),
 
473
            create=True)
474
474
        self.plan_merge_vf = versionedfile._PlanMergeVersionedFile('root',
475
475
                                                                   [self.vf])
476
476