← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-05-19 08:15:16 UTC
  • mfrom: (1714.1.3 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060519081516-cd19bd125a53a4d2
Merge low hanging fruit optimisation of 'bzr add' (Robert Collins, Martin Pool).

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, 
200
 
               help='Select a particular merge algorithm')
 
199
_global_option('merge-type', type=_parse_merge_type)
201
200
_global_option('pattern', type=str)
202
201
_global_option('quiet')
203
202
_global_option('remember', help='Remember the specified location as a'