← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/changelog_merge/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2011-03-31 15:10:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5748.
  • Revision ID: jelmer@samba.org-20110331151005-mtn74ank7ve0xfo7
Fix typo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/changelog_merge/__init__.py
61
61
# overhead of this plugin as minimal as possible.
62
62
def changelog_merge_hook(merger):
63
63
    """Merger.merge_file_content hook for GNU-format ChangeLog files."""
64
 
    from brlib.plugins.changelog_merge.changelog_merge import ChangeLogMerger
 
64
    from bzrlib.plugins.changelog_merge.changelog_merge import ChangeLogMerger
65
65
    return ChangeLogMerger(merger)
66
66
 
67
67
install_lazy_named_hook("bzrlib.merge", "Merger.hooks", "merge_file_content",