/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« 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-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

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