/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/features.py

Merge propagate-exceptions into http-leaks resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/features.py
28
28
pycurl = tests.ModuleAvailableFeature('pycurl')
29
29
pywintypes = tests.ModuleAvailableFeature('pywintypes')
30
30
subunit = tests.ModuleAvailableFeature('subunit')
 
31
sphinx = tests.ModuleAvailableFeature('sphinx')
31
32
 
32
33
 
33
34
class _BackslashDirSeparatorFeature(tests.Feature):
113
114
 
114
115
bash_feature = ExecutableFeature('bash')
115
116
sed_feature = ExecutableFeature('sed')
 
117
diff_feature = ExecutableFeature('diff')