/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_intertree/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2011-11-24 15:48:29 UTC
  • mfrom: (6289 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6337.
  • Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
122
122
    default_tree_format = WorkingTreeFormat3()
123
123
    submod_tests = loader.loadTestsFromModuleNames([
124
124
        'bzrlib.tests.per_intertree.test_compare',
 
125
        'bzrlib.tests.per_intertree.test_file_content_matches',
125
126
        ])
126
127
    test_intertree_permutations = [
127
128
        # test InterTree with two default-format working trees.