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

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:06:46 UTC
  • mfrom: (6673 work)
  • mto: This revision was merged to the branch mainline in revision 6675.
  • Revision ID: jelmer@jelmer.uk-20170610000646-xj6jh277lo4xuo10
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_reconcile.py
17
17
"""Tests for branch implementations - test reconcile() functionality"""
18
18
 
19
19
from breezy import errors, reconcile
20
 
from breezy.branch import BzrBranch
 
20
from breezy.bzrbranch import BzrBranch
21
21
from breezy.symbol_versioning import deprecated_in
22
22
from breezy.tests.per_branch import TestCaseWithBranch
23
23
from breezy.tests import TestNotApplicable