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

  • Committer: Martin Pool
  • Date: 2011-07-21 06:46:34 UTC
  • mfrom: (5967.12.5 test-feature-cleanup)
  • mto: This revision was merged to the branch mainline in revision 6043.
  • Revision ID: mbp@canonical.com-20110721064634-4mirgi3fg7rixwqi
Merge up move of test features into 2.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
20
20
from bzrlib import check, osutils
21
21
from bzrlib.errors import PointlessCommit
22
22
from bzrlib.tests import (
 
23
    TestCaseWithTransport,
 
24
    )
 
25
from bzrlib.tests.features import (
23
26
    SymlinkFeature,
24
 
    TestCaseWithTransport,
25
27
    )
26
28
 
27
29