/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/news_merge/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:22:34 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7306.
  • Revision ID: jelmer@jelmer.uk-20190529032234-mt3fuws8gq03tapi
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/news_merge/__init__.py
34
34
"""
35
35
 
36
36
# Since we are a built-in plugin we share the breezy version
37
 
from ... import version_info
 
37
from ... import version_info  # noqa: F401
38
38
from ...hooks import install_lazy_named_hook
39
39
 
40
40
 
45
45
 
46
46
 
47
47
install_lazy_named_hook("breezy.merge", "Merger.hooks", "merge_file_content",
48
 
    news_merge_hook, "NEWS file merge")
 
48
                        news_merge_hook, "NEWS file merge")
49
49
 
50
50
 
51
51
def test_suite():