/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_merge.py

  • Committer: Aaron Bentley
  • Date: 2006-01-23 18:13:22 UTC
  • mto: (1185.50.54 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: abentley@panoramicfeedback.com-20060123181322-30c089803263530b
Moved merge.merge to builtins

Show diffs side-by-side

added added

removed removed

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