~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4597.3.21.

Cleanup test classes.

* bzrlib/tests/blackbox/test_conflicts.py:
(TestBase): A new helper.
(TestConflicts, TestResolve): One class for each command.
(TestResolve.test_resolve_in_subdir): No need to restore the
current dir.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: