← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/features.py

  • Committer: Martin Pool
  • Date: 2010-08-20 06:49:00 UTC
  • mfrom: (5349.1.5 234708-diff)
  • mto: This revision was merged to the branch mainline in revision 5384.
  • Revision ID: mbp@sourcefrog.net-20100820064900-hhbu782e4vi06v6d
resolve news conflicts in diff --using --diff-options branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/features.py
114
114
 
115
115
bash_feature = ExecutableFeature('bash')
116
116
sed_feature = ExecutableFeature('sed')
 
117
diff_feature = ExecutableFeature('diff')