← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2011-08-04 13:30:30 UTC
  • mfrom: (6050 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6052.
  • Revision ID: jelmer@samba.org-20110804133030-uwo00unp8b0n782c
merge bzr.dev.

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