← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/__init__.py
60
60
        'bzrlib.tests.workingtree_implementations.test_is_control_filename',
61
61
        'bzrlib.tests.workingtree_implementations.test_is_ignored',
62
62
        'bzrlib.tests.workingtree_implementations.test_locking',
 
63
        'bzrlib.tests.workingtree_implementations.test_merge_from_branch',
 
64
        'bzrlib.tests.workingtree_implementations.test_parents',
63
65
        'bzrlib.tests.workingtree_implementations.test_pull',
 
66
        'bzrlib.tests.workingtree_implementations.test_unversion',
64
67
        'bzrlib.tests.workingtree_implementations.test_workingtree',
65
68
        ]
66
69
    adapter = WorkingTreeTestProviderAdapter(