/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

Merge (hopefully the last time) mainline fixes for 0.15.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
18
18
import os
19
19
import shutil
20
20
 
21
 
from bzrlib.tests import TestCaseWithTransport
 
21
from bzrlib.tests import (
 
22
    TestCaseWithTransport,
 
23
    TestSkipped,
 
24
    )
22
25
from bzrlib.branch import Branch
23
26
from bzrlib.errors import PointlessCommit, BzrError
24
27
from bzrlib.tests.test_revision import make_branches