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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 19:09:26 UTC
  • mfrom: (6622.1.36 breezy)
  • Revision ID: jelmer@jelmer.uk-20170521190926-5vtz8xaf0e9ylrpc
Merge rename to breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_merger.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
"""Implementation tests for bzrlib.merge.Merger."""
 
17
"""Implementation tests for breezy.merge.Merger."""
18
18
 
19
19
import os
20
20
 
21
 
from bzrlib.conflicts import TextConflict
22
 
from bzrlib import (
 
21
from breezy.conflicts import TextConflict
 
22
from breezy import (
23
23
    errors,
24
24
    merge as _mod_merge,
25
25
    )
26
 
from bzrlib.tests import (
 
26
from breezy.tests import (
27
27
    multiply_tests,
28
28
    TestCaseWithTransport,
29
29
    )
30
 
from bzrlib.tests.test_merge_core import MergeBuilder
31
 
from bzrlib.transform import TreeTransform
 
30
from breezy.tests.test_merge_core import MergeBuilder
 
31
from breezy.transform import TreeTransform
32
32
 
33
33
 
34
34