← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

(gz) Include registry option value switches in help style checking test
 (Martin Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
526
526
 
527
527
_merge_type_registry = MergeTypeRegistry()
528
528
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',
529
 
                                   "Merge using external diff3")
 
529
                                   "Merge using external diff3.")
530
530
_merge_type_registry.register_lazy('lca', 'bzrlib.merge', 'LCAMerger',
531
 
                                   "LCA-newness merge")
 
531
                                   "LCA-newness merge.")
532
532
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
533
 
                                   "Native diff3-style merge")
 
533
                                   "Native diff3-style merge.")
534
534
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
535
 
                                   "Weave-based merge")
 
535
                                   "Weave-based merge.")
536
536
 
537
537
# Declare the standard options
538
538
_standard_option('help', short_name='h',