/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-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_merger.py
18
18
 
19
19
import os
20
20
 
21
 
from breezy.conflicts import TextConflict
22
 
from breezy import (
 
21
from ..conflicts import TextConflict
 
22
from .. import (
23
23
    errors,
24
24
    merge as _mod_merge,
25
25
    )
26
 
from breezy.tests import (
 
26
from . import (
27
27
    multiply_tests,
28
28
    TestCaseWithTransport,
29
29
    )
30
 
from breezy.tests.test_merge_core import MergeBuilder
31
 
from breezy.transform import TreeTransform
 
30
from .test_merge_core import MergeBuilder
 
31
from ..transform import TreeTransform
32
32
 
33
33
 
34
34