← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-17 00:34:28 UTC
  • mfrom: (4754 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4755.
  • Revision ID: john@arbash-meinel.com-20091017003428-opg71qwkbzr3clko
Merge bzr.dev resolve test conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
3690
3690
        'bzrlib.tests.per_repository',
3691
3691
        'bzrlib.tests.per_repository_chk',
3692
3692
        'bzrlib.tests.per_repository_reference',
 
3693
        'bzrlib.tests.per_uifactory',
3693
3694
        'bzrlib.tests.per_versionedfile',
3694
3695
        'bzrlib.tests.per_workingtree',
3695
3696
        'bzrlib.tests.test__annotator',