← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_help.py
161
161
    def test_help_with_aliases(self):
162
162
        original = self.run_bzr('help cat')[0]
163
163
 
164
 
        conf = config.GlobalConfig.from_bytes('''[ALIASES]
 
164
        conf = config.GlobalConfig.from_string('''[ALIASES]
165
165
c=cat
166
166
cat=cat
167
167
''', save=True)