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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 19:09:26 UTC
  • mfrom: (6622.1.36 breezy)
  • Revision ID: jelmer@jelmer.uk-20170521190926-5vtz8xaf0e9ylrpc
Merge rename to breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge_core.py
17
17
import os
18
18
import sys
19
19
 
20
 
import bzrlib
21
 
from bzrlib import (
 
20
import breezy
 
21
from breezy 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 breezy.conflicts import (
29
29
    ContentsConflict,
30
30
    TextConflict,
31
31
    PathConflict,
32
32
    )
33
 
from bzrlib.merge import (
 
33
from breezy.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 breezy.osutils import getcwd, pathjoin
 
40
from breezy.transform import TreeTransform
 
41
from breezy.tests import TestCaseWithTransport, TestSkipped
 
42
from breezy.workingtree import WorkingTree
43
43
 
44
44
 
45
45
class MergeBuilder(object):