/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/plugins/po_merge/po_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
from __future__ import absolute_import
20
20
 
21
 
from bzrlib import (
 
21
from ... import (
22
22
    config,
23
23
    merge,
24
24
    )
25
25
 
26
26
 
27
 
from bzrlib.lazy_import import lazy_import
 
27
from breezy.lazy_import import lazy_import
28
28
lazy_import(globals(), """
29
29
import fnmatch
30
30
import subprocess
31
31
import tempfile
32
32
import sys
33
33
 
34
 
from bzrlib import (
 
34
from breezy import (
35
35
    cmdline,
36
36
    osutils,
37
37
    trace,