~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

Implemented two-way merge, refactored weave merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
972
972
                   'bzrlib.tests.test_store',
973
973
                   'bzrlib.tests.test_symbol_versioning',
974
974
                   'bzrlib.tests.test_testament',
 
975
                   'bzrlib.tests.test_textmerge',
975
976
                   'bzrlib.tests.test_trace',
976
977
                   'bzrlib.tests.test_transactions',
977
978
                   'bzrlib.tests.test_transform',