~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/__init__.py

  • Committer: Robert Collins
  • Date: 2005-10-06 22:15:52 UTC
  • mfrom: (1185.13.2)
  • mto: This revision was merged to the branch mainline in revision 1420.
  • Revision ID: robertc@robertcollins.net-20051006221552-9b15c96fa504e0ad
mergeĀ fromĀ upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
488
488
                   'bzrlib.selftest.testgraph',
489
489
                   'bzrlib.selftest.testworkingtree',
490
490
                   'bzrlib.selftest.test_upgrade',
 
491
                   'bzrlib.selftest.test_conflicts',
491
492
                   ]
492
493
 
493
494
    for m in (bzrlib.store, bzrlib.inventory, bzrlib.branch,