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

  • Committer: Jelmer Vernooij
  • Date: 2019-07-27 22:47:49 UTC
  • mfrom: (7377 work)
  • mto: This revision was merged to the branch mainline in revision 7378.
  • Revision ID: jelmer@jelmer.uk-20190727224749-rta5fv1sc4ivy6ko
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/mergeable.py
23
23
    transport as _mod_transport,
24
24
    urlutils,
25
25
    )
26
 
from breezy.bundle import serializer as _serializer
 
26
from breezy.bzr.bundle import serializer as _serializer
27
27
from breezy.merge_directive import MergeDirective
28
28
from breezy.i18n import gettext
29
29
""")