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

  • Committer: Jelmer Vernooij
  • Date: 2019-02-03 23:43:20 UTC
  • mfrom: (7267 work)
  • mto: This revision was merged to the branch mainline in revision 7268.
  • Revision ID: jelmer@jelmer.uk-20190203234320-zbquyl9973hbujnb
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge_directive.py
31
31
    registry,
32
32
    revision as _mod_revision,
33
33
    rio,
34
 
    testament,
35
34
    timestamp,
36
35
    trace,
37
36
    )
 
37
from breezy.bzr import (
 
38
    testament,
 
39
    )
38
40
from breezy.bundle import (
39
41
    serializer as bundle_serializer,
40
42
    )