← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_reconcile.py

  • Committer: Andrew Bennetts
  • Date: 2007-03-28 07:08:42 UTC
  • mfrom: (2380 +trunk)
  • mto: (2018.5.146 hpss)
  • mto: This revision was merged to the branch mainline in revision 2414.
  • Revision ID: andrew.bennetts@canonical.com-20070328070842-r843houy668oxb9o
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
22
22
from bzrlib.inventory import Inventory
23
23
import bzrlib.repository as repository
24
24
from bzrlib.tests import TestCaseWithTransport
25
 
from bzrlib.tests.blackbox import TestUIFactory
 
25
from bzrlib.tests import TestUIFactory
26
26
from bzrlib.transport import get_transport
27
27
import bzrlib.ui as ui
28
28