/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/test_commit_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:
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib import (
 
20
from .. import (
21
21
    check,
22
22
    osutils,
23
23
    )
24
 
from bzrlib.errors import PointlessCommit
25
 
from bzrlib.tests import (
 
24
from ..errors import PointlessCommit
 
25
from . import (
26
26
    TestCaseWithTransport,
27
27
    )
28
 
from bzrlib.tests.features import (
 
28
from .features import (
29
29
    SymlinkFeature,
30
30
    )
31
 
from bzrlib.tests.matchers import RevisionHistoryMatches
 
31
from .matchers import RevisionHistoryMatches
32
32
 
33
33
 
34
34
class TestCommitMerge(TestCaseWithTransport):