/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 brzlib/tests/test_merge_core.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 11:25:18 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521112518-5x3xa7t4hnjk8kb8
Rename bzrlib => brzlib, bzr => brz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/tests/test_merge_core.py
17
17
import os
18
18
import sys
19
19
 
20
 
import bzrlib
21
 
from bzrlib import (
 
20
import brzlib
 
21
from brzlib import (
22
22
    controldir,
23
23
    errors,
24
24
    generate_ids,
25
25
    merge_directive,
26
26
    osutils,
27
27
    )
28
 
from bzrlib.conflicts import (
 
28
from brzlib.conflicts import (
29
29
    ContentsConflict,
30
30
    TextConflict,
31
31
    PathConflict,
32
32
    )
33
 
from bzrlib.merge import (
 
33
from brzlib.merge import (
34
34
    Merge3Merger,
35
35
    Diff3Merger,
36
36
    WeaveMerger,
37
37
    Merger,
38
38
    )
39
 
from bzrlib.osutils import getcwd, pathjoin
40
 
from bzrlib.transform import TreeTransform
41
 
from bzrlib.tests import TestCaseWithTransport, TestSkipped
42
 
from bzrlib.workingtree import WorkingTree
 
39
from brzlib.osutils import getcwd, pathjoin
 
40
from brzlib.transform import TreeTransform
 
41
from brzlib.tests import TestCaseWithTransport, TestSkipped
 
42
from brzlib.workingtree import WorkingTree
43
43
 
44
44
 
45
45
class MergeBuilder(object):