/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/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:
35
35
    )
36
36
from .trace import mutter
37
37
from .tsort import topo_sort
38
 
from .versionedfile import AdapterFactory, FulltextContentFactory
 
38
from .bzr.versionedfile import AdapterFactory, FulltextContentFactory
39
39
from .i18n import gettext
40
40
 
41
41