~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: John Arbash Meinel
  • Date: 2005-11-12 19:55:34 UTC
  • mto: (1587.1.6 bound-branches)
  • mto: This revision was merged to the branch mainline in revision 1590.
  • Revision ID: john@arbash-meinel.com-20051112195534-3e33d6225502834b
(broken) working on implementing bound branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
168
168
_global_option('overwrite', help='Ignore differences between branches and '
169
169
               'overwrite unconditionally')
170
170
_global_option('basis', type=str)
 
171
_global_option('bound')
171
172
_global_option('diff-options', type=str)
172
173
_global_option('help',
173
174
               help='show help message')
186
187
_global_option('timezone', 
187
188
               type=str,
188
189
               help='display timezone as local, original, or utc')
 
190
_global_option('unbound')
189
191
_global_option('verbose',
190
192
               help='display more information')
191
193
_global_option('version')