← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_intertree/__init__.py

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_intertree/__init__.py
24
24
 
25
25
import bzrlib
26
26
from bzrlib import (
27
 
    errors,
28
27
    revisiontree,
29
28
    tests,
30
29
    )
39
38
    TestCaseWithTree,
40
39
    )
41
40
from bzrlib.tree import InterTree
42
 
from bzrlib.workingtree import (
43
 
    WorkingTreeFormat3,
44
 
    )
 
41
from bzrlib.workingtree_3 import WorkingTreeFormat3
45
42
from bzrlib.workingtree_4 import WorkingTreeFormat4
46
43
 
47
44