← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/features.py

  • Committer: Patch Queue Manager
  • Date: 2011-11-29 10:47:47 UTC
  • mfrom: (6282.3.13 884270-merge-po)
  • Revision ID: pqm@pqm.ubuntu.com-20111129104747-32qen0v8yxbxeoov
(vila) Smarter .po file merging with merge hook as a plugin: po_merge.
 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/features.py
408
408
 
409
409
 
410
410
bash_feature = ExecutableFeature('bash')
 
411
diff_feature = ExecutableFeature('diff')
411
412
sed_feature = ExecutableFeature('sed')
412
 
diff_feature = ExecutableFeature('diff')
 
413
msgmerge_feature = ExecutableFeature('msgmerge')
413
414
 
414
415
 
415
416
class _PosixPermissionsFeature(Feature):