← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-01 19:18:09 UTC
  • mfrom: (6459 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6460.
  • Revision ID: jelmer@samba.org-20120201191809-xn340a5i5v4fqsfu
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
559
559
class TestPlanMerge(TestCaseWithMemoryTransport):
560
560
 
561
561
    def setUp(self):
562
 
        super(TestPlanMerge, self).setUp()
 
562
        TestCaseWithMemoryTransport.setUp(self)
563
563
        mapper = versionedfile.PrefixMapper()
564
564
        factory = knit.make_file_factory(True, mapper)
565
565
        self.vf = factory(self.get_transport())