← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

Moved the merge stuff into merge.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
19
19
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
20
20
                           ReusingTransform, CantMoveRoot, NotVersionedError)
21
21
from bzrlib.osutils import file_kind, has_symlinks
 
22
from bzrlib.merge import Merge3Merger
22
23
from bzrlib.tests import TestCaseInTempDir, TestSkipped
23
24
from bzrlib.transform import (TreeTransform, ROOT_PARENT, FinalPaths, 
24
 
                              resolve_conflicts, Merge3Merger, 
25
 
                              find_interesting)
 
25
                              resolve_conflicts, find_interesting)
26
26
 
27
27
class TestTreeTransform(TestCaseInTempDir):
28
28
    def setUp(self):