← 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: Aaron Bentley
  • Date: 2007-03-02 02:46:26 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2330.
  • Revision ID: aaron.bentley@utoronto.ca-20070302024626-nxb07lxv8k162wwd
Get merge-directive command basically working

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
67
67
                     'bzrlib.tests.blackbox.test_logformats',
68
68
                     'bzrlib.tests.blackbox.test_ls',
69
69
                     'bzrlib.tests.blackbox.test_merge',
 
70
                     'bzrlib.tests.blackbox.test_merge_directive',
70
71
                     'bzrlib.tests.blackbox.test_missing',
71
72
                     'bzrlib.tests.blackbox.test_mv',
72
73
                     'bzrlib.tests.blackbox.test_nick',