← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/__init__.py

  • Committer: Martin Pool
  • Date: 2005-08-01 23:14:12 UTC
  • mfrom: (974.1.11)
  • Revision ID: mbp@sourcefrog.net-20050801231412-6a6278d24a7cbb0a
- merge aaron's revert and merge improvements

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/__init__.py
53
53
                   'bzrlib.selftest.blackbox',
54
54
                   'bzrlib.selftest.testrevisionnamespaces',
55
55
                   'bzrlib.selftest.testbranch',
 
56
                   'bzrlib.merge_core',
 
57
                   'bzrlib.selftest.testdiff',
56
58
                   ]
57
59
 
58
60
    # XXX: should also test bzrlib.merge_core, but they seem to be out