← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Andrew Bennetts
  • Date: 2010-07-29 04:07:27 UTC
  • mto: (5050.3.16 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: andrew.bennetts@canonical.com-20100729040727-amlyw1jt3xhw17ku
Delete test_merge_into, and put those tests directly in test_merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
3753
3753
        'bzrlib.tests.test_merge3',
3754
3754
        'bzrlib.tests.test_merge_core',
3755
3755
        'bzrlib.tests.test_merge_directive',
3756
 
        'bzrlib.tests.test_merge_into',
3757
3756
        'bzrlib.tests.test_missing',
3758
3757
        'bzrlib.tests.test_msgeditor',
3759
3758
        'bzrlib.tests.test_multiparent',