/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/__init__.py

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
52
52
                     'bzrlib.tests.blackbox.test_commit',
53
53
                     'bzrlib.tests.blackbox.test_conflicts',
54
54
                     'bzrlib.tests.blackbox.test_debug',
 
55
                     'bzrlib.tests.blackbox.test_deleted',
55
56
                     'bzrlib.tests.blackbox.test_diff',
56
57
                     'bzrlib.tests.blackbox.test_dump_btree',
57
58
                     'bzrlib.tests.blackbox.test_dpush',
71
72
                     'bzrlib.tests.blackbox.test_locale',
72
73
                     'bzrlib.tests.blackbox.test_log',
73
74
                     'bzrlib.tests.blackbox.test_logformats',
 
75
                     'bzrlib.tests.blackbox.test_lookup_revision',
74
76
                     'bzrlib.tests.blackbox.test_ls',
75
77
                     'bzrlib.tests.blackbox.test_lsprof',
76
78
                     'bzrlib.tests.blackbox.test_merge',