← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.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_status.py
28
28
 
29
29
from bzrlib.tests import TestCaseInTempDir
30
30
from bzrlib.revisionspec import RevisionSpec
31
 
from bzrlib.merge import merge
 
31
from bzrlib.builtins import merge
32
32
from bzrlib.status import show_status
33
33
from bzrlib.branch import Branch
34
34
from bzrlib.clone import copy_branch