← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_import_tariff.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-17 09:23:19 UTC
  • mfrom: (5301 +trunk)
  • mto: (5247.1.8 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100617092319-da2bzdtf3j0voynf
Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_import_tariff.py
93
93
            'bzrlib.bundle.commands',
94
94
            'bzrlib.cmd_version_info',
95
95
            'bzrlib.foreign',
 
96
            'bzrlib.merge3',
 
97
            'bzrlib.patiencediff',
96
98
            'bzrlib.remote',
97
99
            'bzrlib.sign_my_commits',
98
100
            'bzrlib.smart',
 
101
            'bzrlib.transform',
99
102
            'kerberos',
100
103
            'smtplib',
101
104
            'tarfile',