← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-01-03 07:36:04 UTC
  • mfrom: (3144.3.7 lcamerge)
  • Revision ID: pqm@pqm.ubuntu.com-20080103073604-bdu4u15nqv5hlqb4
Add new 'LCA merge' merge algorithm (abentley)

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