~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Aaron Bentley
  • Date: 2007-02-28 18:51:18 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2330.
  • Revision ID: abentley@panoramicfeedback.com-20070228185118-9m1ko9deqtokocil
Got directives round-tripping, with bundles and everything

Show diffs side-by-side

added added

removed removed

Lines of Context:
1797
1797
                   'bzrlib.tests.test_merge',
1798
1798
                   'bzrlib.tests.test_merge3',
1799
1799
                   'bzrlib.tests.test_merge_core',
 
1800
                   'bzrlib.tests.test_merge_directive',
1800
1801
                   'bzrlib.tests.test_missing',
1801
1802
                   'bzrlib.tests.test_msgeditor',
1802
1803
                   'bzrlib.tests.test_nonascii',