← 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-06-06 12:06:20 UTC
  • mfrom: (1740 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: larstiq@larstiq.dyndns.org-20060606120620-50066b0951e4ef7c
merge bzr.dev 1740

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'