← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconcile.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
20
20
from bzrlib import bzrdir, errors, tests
21
21
from bzrlib.reconcile import reconcile, Reconciler
22
22
from bzrlib.revision import Revision
23
 
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
 
23
from bzrlib.tests.per_repository import TestCaseWithRepository
24
24
from bzrlib.transport import get_transport
25
25
from bzrlib.workingtree import WorkingTree
26
26