/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-25 23:22:30 UTC
  • mfrom: (7374 work)
  • mto: This revision was merged to the branch mainline in revision 7376.
  • Revision ID: jelmer@jelmer.uk-20190725232230-9b4x1nn0m19j1oh0
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
""")