/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/test_merge.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:
breezy/tests/test_merge.py
21
21
    cleanup,
22
22
    conflicts,
23
23
    errors,
24
 
    inventory,
25
 
    knit,
26
24
    memorytree,
27
25
    merge as _mod_merge,
28
26
    option,
29
27
    revision as _mod_revision,
30
28
    tests,
31
29
    transform,
 
30
    )
 
31
from ..bzr import (
 
32
    inventory,
 
33
    knit,
32
34
    versionedfile,
33
35
    )
34
36
from ..conflicts import ConflictList, TextConflict