/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/test_reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
 
20
20
from breezy import (
21
 
    bzrdir,
22
21
    errors,
23
22
    tests,
24
23
    )
 
24
from breezy.bzr import (
 
25
    bzrdir,
 
26
    )
25
27
from breezy.reconcile import reconcile, Reconciler
26
28
from breezy.tests import per_repository
27
29