/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: Canonical.com Patch Queue Manager
  • Date: 2006-03-06 00:49:26 UTC
  • mfrom: (1587.1.14 bound-branches)
  • Revision ID: pqm@pqm.ubuntu.com-20060306004926-6d7a10c990bc17d1
Merge in bound branches core support.

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')