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

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
506
506
# Declare the standard options
507
507
_standard_option('help', short_name='h',
508
508
                 help='Show help message.')
 
509
_standard_option('null', short_name='0',
 
510
                 help='Use an ASCII NUL (\\0) separator rather than '
 
511
                      'a newline.')
509
512
_standard_option('usage',
510
513
                 help='Show usage message and options.')
511
514
_standard_option('verbose', short_name='v',
530
533
               short_name='m',
531
534
               help='Message string.')
532
535
_global_option('no-recurse')
533
 
_global_option('null', short_name='0',
534
 
                 help='Use an ASCII NUL (\\0) separator rather than '
535
 
                      'a newline.')
536
536
_global_option('profile',
537
537
               help='Show performance profiling information.')
538
538
_global_option('revision',