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

  • Committer: Jelmer Vernooij
  • Date: 2020-01-11 17:41:33 UTC
  • mto: This revision was merged to the branch mainline in revision 7440.
  • Revision ID: jelmer@jelmer.uk-20200111174133-ob2p0twwsmvw5ut7
Don't lazy-import errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/conflicts.py
27
27
import errno
28
28
 
29
29
from breezy import (
30
 
    errors,
31
30
    osutils,
32
31
    rio,
33
32
    trace,
38
37
""")
39
38
from . import (
40
39
    cache_utf8,
 
40
    errors,
41
41
    commands,
42
42
    option,
43
43
    registry,