← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/hooks.py

Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/hooks.py
59
59
    ('bzrlib.version_info_formats.format_rio', 'RioVersionInfoBuilder.hooks'),
60
60
    'bzrlib.version_info_formats.format_rio', 'RioVersionInfoBuilderHooks')
61
61
known_hooks.register_lazy(
62
 
    ('bzrlib.merge_directive', '_BaseMergeDirective.hooks'),
 
62
    ('bzrlib.merge_directive', 'BaseMergeDirective.hooks'),
63
63
    'bzrlib.merge_directive', 'MergeDirectiveHooks')
64
64
 
65
65