← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Packman
  • Date: 2011-11-23 13:13:30 UTC
  • mto: This revision was merged to the branch mainline in revision 6319.
  • Revision ID: martin.packman@canonical.com-20111123131330-o74n3k3nycitziv9
No longer want register_lazy as passing objects directly

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
2041
2041
 
2042
2042
 
2043
2043
merge_type_registry = registry.Registry()
2044
 
merge_type_registry.register_lazy('diff3', Diff3Merger,
2045
 
                                  "Merge using external diff3")
2046
 
merge_type_registry.register_lazy('lca', LCAMerger,
2047
 
                                  "LCA-newness merge")
2048
 
merge_type_registry.register_lazy('merge3', Merge3Merger,
2049
 
                                  "Native diff3-style merge")
2050
 
merge_type_registry.register_lazy('weave', WeaveMerger,
2051
 
                                  "Weave-based merge")
 
2044
merge_type_registry.register('diff3', Diff3Merger,
 
2045
                             "Merge using external diff3")
 
2046
merge_type_registry.register('lca', LCAMerger,
 
2047
                             "LCA-newness merge")
 
2048
merge_type_registry.register('merge3', Merge3Merger,
 
2049
                             "Native diff3-style merge")
 
2050
merge_type_registry.register('weave', WeaveMerger,
 
2051
                             "Weave-based merge")
2052
2052
 
2053
2053
 
2054
2054
def get_merge_type_registry():