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

Fixed conflict commands

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
38
38
                     'bzrlib.tests.blackbox.test_cat',
39
39
                     'bzrlib.tests.blackbox.test_checkout',
40
40
                     'bzrlib.tests.blackbox.test_commit',
 
41
                     'bzrlib.tests.blackbox.test_conflicts',
41
42
                     'bzrlib.tests.blackbox.test_diff',
42
43
                     'bzrlib.tests.blackbox.test_export',
43
44
                     'bzrlib.tests.blackbox.test_find_merge_base',