/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/tests/per_workingtree/test_merge_from_branch.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:
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import (
 
22
from breezy import (
23
23
    conflicts,
24
24
    errors,
25
25
    merge,
26
26
    )
27
 
from bzrlib.tests import per_workingtree
 
27
from breezy.tests import per_workingtree
28
28
 
29
29
 
30
30
class TestMergeFromBranch(per_workingtree.TestCaseWithWorkingTree):