← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-01-25 13:59:32 UTC
  • mfrom: (5321.1.119 mergetools)
  • Revision ID: pqm@pqm.ubuntu.com-20110125135932-0o8d07i3j1flp6ou
(vila) Added external merge tool management module,
 bzrlib.mergetools. (Gordon Tyler)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
3802
3802
        'bzrlib.tests.test_merge3',
3803
3803
        'bzrlib.tests.test_merge_core',
3804
3804
        'bzrlib.tests.test_merge_directive',
 
3805
        'bzrlib.tests.test_mergetools',
3805
3806
        'bzrlib.tests.test_missing',
3806
3807
        'bzrlib.tests.test_msgeditor',
3807
3808
        'bzrlib.tests.test_multiparent',