← 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: 2008-02-24 16:42:13 UTC
  • mfrom: (3234 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3235.
  • Revision ID: aaron@aaronbentley.com-20080224164213-eza1lzru5bwuwmmj
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
474
474
                                   "Merge using external diff3")
475
475
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
476
476
                                   "Weave-based merge")
 
477
_merge_type_registry.register_lazy('lca', 'bzrlib.merge', 'LCAMerger',
 
478
                                   "LCA-newness merge")
477
479
 
478
480
# Declare the standard options
479
481
_standard_option('help', short_name='h',