← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Jelmer Vernooij
  • Date: 2010-12-24 22:40:27 UTC
  • mto: This revision was merged to the branch mainline in revision 5588.
  • Revision ID: jelmer@samba.org-20101224224027-pvmx1m1mwf0ous0g
Remove unused imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
18
18
import os
19
19
 
20
20
from bzrlib import (
21
 
    branchbuilder,
22
21
    bzrdir,
23
22
    conflicts,
24
23
    errors,
25
24
    option,
26
25
    tests,
27
 
    workingtree,
28
26
    )
29
27
from bzrlib.tests import (
30
28
    script,