/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/mergetools.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:
24
24
import sys
25
25
import tempfile
26
26
 
27
 
from brzlib.lazy_import import lazy_import
 
27
from breezy.lazy_import import lazy_import
28
28
lazy_import(globals(), """
29
 
from brzlib import (
 
29
from breezy import (
30
30
    cmdline,
31
31
    osutils,
32
32
    trace,