← 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: Canonical.com Patch Queue Manager
  • Date: 2006-06-29 18:21:57 UTC
  • mfrom: (1711.2.72 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060629182157-cdc39b5f9e4fac85
(jam) add run_bzr_error, clean up remerge tests

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',