~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-19 12:22:23 UTC
  • mfrom: (6143.1.8 i18n-plurals)
  • Revision ID: pqm@pqm.ubuntu.com-20110919122223-243tgzmfebanxxbi
(jr) Use ngettext instead of "words(s) with brackets" for plurals (Jonathan
 Riddell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1080
1080
# Create a debian branch based on trunk
1081
1081
$ cd ..
1082
1082
$ bzr branch trunk -r 1 debian
1083
 
2>Branched 1 revision(s).
 
1083
2>Branched 1 revision.
1084
1084
$ cd debian
1085
1085
$ mkdir dir
1086
1086
$ bzr add