← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2006-06-30 14:06:16 UTC
  • mfrom: (1825 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1826.
  • Revision ID: john@arbash-meinel.com-20060630140616-074ad0ebb523972f
[merge] bzr.dev 1825

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
68
68
                     'bzrlib.tests.blackbox.test_pull',
69
69
                     'bzrlib.tests.blackbox.test_push',
70
70
                     'bzrlib.tests.blackbox.test_reconcile',
 
71
                     'bzrlib.tests.blackbox.test_remerge',
71
72
                     'bzrlib.tests.blackbox.test_remove',
72
73
                     'bzrlib.tests.blackbox.test_re_sign',
73
74
                     'bzrlib.tests.blackbox.test_revert',