~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
145
145
        new = topics.get_detail('current-formats')
146
146
        rest = topics.get_detail('other-formats')
147
147
        experimental, deprecated = rest.split('Deprecated formats')
148
 
        self.assertContainsRe(new, 'bzr help formats')
 
148
        self.assertContainsRe(new, 'formats-help')
149
149
        self.assertContainsRe(new,
150
150
                ':knit:\n    \(native\) \(default\) Format using knits\n')
151
151
        self.assertContainsRe(experimental,