← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Martin Pool
  • Date: 2006-05-23 10:57:02 UTC
  • mfrom: (1725 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1726.
  • Revision ID: mbp@sourcefrog.net-20060523105702-e5de4664cfdb4e8d
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
196
196
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
197
197
_global_option('root', type=str)
198
198
_global_option('no-backup')
199
 
_global_option('merge-type', type=_parse_merge_type)
 
199
_global_option('merge-type', type=_parse_merge_type, 
 
200
               help='Select a particular merge algorithm')
200
201
_global_option('pattern', type=str)
201
202
_global_option('quiet')
202
203
_global_option('remember', help='Remember the specified location as a'