← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository_vf/__init__.py
43
43
        'test_find_text_key_references',
44
44
        'test__generate_text_key_index',
45
45
        'test_fetch',
 
46
        'test_fileid_involved',
 
47
        'test_merge_directive',
46
48
        'test_reconcile',
47
49
        'test_refresh_data',
48
50
        'test_repository',