← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

[merge] up-to-date against bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
2
2
 
3
3
from bzrlib.branch import Branch
4
4
from bzrlib.commit import commit
5
 
from bzrlib.selftest import TestCaseInTempDir
 
5
from bzrlib.tests import TestCaseInTempDir
6
6
from bzrlib.merge import merge
7
7
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
8
8
from bzrlib.revision import common_ancestor