/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/tests/test_news_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 18:10:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521181028-zn04pdfw0od9hfj3
Rename brzlib => breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/news_merge/tests/test_news_merge.py
19
19
# Note that the single test from this file is now in
20
20
# test_merge.TestConfigurableFileMerger -- rbc 20100129.
21
21
 
22
 
from brzlib import (
 
22
from breezy import (
23
23
    option,
24
24
    tests,
25
25
    )
26
 
from brzlib.merge import Merger
27
 
from brzlib.plugins import news_merge
 
26
from breezy.merge import Merger
 
27
from breezy.plugins import news_merge