← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_conflicts.py

Merge With main tree, move the NEWS entry to the good place.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
19
19
from bzrlib.workingtree import WorkingTree
20
20
from bzrlib.tests.blackbox import ExternalBase
21
21
 
 
22
# FIXME: These don't really look at the output of the conflict commands, just
 
23
# the number of lines - there should be more examination.
 
24
 
22
25
class TestConflicts(ExternalBase):
23
26
    def setUp(self):
24
27
        super(ExternalBase, self).setUp()