/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/workingtree_implementations/__init__.py

Merge 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',
63
64
        'bzrlib.tests.workingtree_implementations.test_parents',
64
65
        'bzrlib.tests.workingtree_implementations.test_pull',
65
66
        'bzrlib.tests.workingtree_implementations.test_workingtree',