← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Aaron Bentley
  • Date: 2006-03-07 05:59:14 UTC
  • mfrom: (1558.1.20 Aaron's integration)
  • mto: This revision was merged to the branch mainline in revision 1595.
  • Revision ID: aaron.bentley@utoronto.ca-20060307055914-a88728997afceb90
Merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
161
161
_global_option('overwrite', help='Ignore differences between branches and '
162
162
               'overwrite unconditionally')
163
163
_global_option('basis', type=str)
 
164
_global_option('bound')
164
165
_global_option('diff-options', type=str)
165
166
_global_option('help',
166
167
               help='show help message')
179
180
_global_option('timezone', 
180
181
               type=str,
181
182
               help='display timezone as local, original, or utc')
 
183
_global_option('unbound')
182
184
_global_option('verbose',
183
185
               help='display more information')
184
186
_global_option('version')