← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/__init__.py

  • Committer: Aaron Bentley
  • Date: 2005-10-06 04:29:10 UTC
  • mfrom: (1185.14.11)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051006042910-a3263271389bfdc2
Merged conflict handling work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/__init__.py
483
483
                   'bzrlib.selftest.testgraph',
484
484
                   'bzrlib.selftest.testworkingtree',
485
485
                   'bzrlib.selftest.test_upgrade',
 
486
                   'bzrlib.selftest.test_conflicts',
486
487
                   ]
487
488
 
488
489
    for m in (bzrlib.store, bzrlib.inventory, bzrlib.branch,