~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/__init__.py

Merge Aarons conflict plugin for 0.1rc1

Show diffs side-by-side

added added

removed removed

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