← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Wouter van Heyst
  • Date: 2006-12-20 18:31:23 UTC
  • mfrom: (2201.2.1 revision.help)
  • mto: This revision was merged to the branch mainline in revision 2206.
  • Revision ID: larstiq@larstiq.dyndns.org-20061220183123-qpvjpnhvo63yjhho
Fix merge conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
228
228
_global_option('no-recurse')
229
229
_global_option('profile',
230
230
               help='show performance profiling information')
231
 
_global_option('revision', 
 
231
_global_option('revision',
232
232
               type=_parse_revision_str,
233
 
               short_name='r')
 
233
               short_name='r',
 
234
               help='See \'help revisionspec\' for details')
234
235
_global_option('show-ids', 
235
236
               help='show internal object ids')
236
237
_global_option('timezone',