/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: 2017-05-21 18:10:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521181028-zn04pdfw0od9hfj3
Rename brzlib => breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/conflicts.py
21
21
 
22
22
import os
23
23
 
24
 
from brzlib.lazy_import import lazy_import
 
24
from breezy.lazy_import import lazy_import
25
25
lazy_import(globals(), """
26
26
import errno
27
27
 
28
 
from brzlib import (
 
28
from breezy import (
29
29
    cleanup,
30
30
    errors,
31
31
    osutils,
34
34
    transform,
35
35
    workingtree,
36
36
    )
37
 
from brzlib.i18n import gettext, ngettext
 
37
from breezy.i18n import gettext, ngettext
38
38
""")
39
 
from brzlib import (
 
39
from breezy import (
40
40
    commands,
41
41
    option,
42
42
    registry,