-
Committer:
Andrew Bennetts
-
Date:
2010-06-04 03:09:35 UTC
-
mto:
This revision was merged to the branch mainline in
revision
5280.
-
Revision ID:
andrew.bennetts@canonical.com-20100604030935-4slnx0e8uh9b8yk6
lazy_import most things in merge.py; add a few representative modules to the import tariff tests; tweak a couple of other modules so that patiencediff is not necessarily imported; remove a bunch of unused imports from test_knit.py.