← Back to branch summary

~jelmer/brz/colocated-spec

« back to all changes in this revision

Viewing changes to breezy/tests/test_conflicts.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_conflicts.py
17
17
 
18
18
import os
19
19
 
20
 
from breezy import (
 
20
from .. import (
21
21
    conflicts,
22
22
    errors,
23
23
    option,
24
24
    osutils,
25
25
    tests,
26
26
    )
27
 
from breezy.tests import (
 
27
from . import (
28
28
    script,
29
29
    scenarios,
30
30
    )