← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Aaron Bentley
  • Date: 2009-04-10 20:07:41 UTC
  • Revision ID: aaron@aaronbentley.com-20090410200741-qg98vn5l50mcwzd1
Get conflict-diff under test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
76
76
    import tests.test_dotgraph
77
77
    import tests.is_clean
78
78
    import tests.test_cbranch
 
79
    import tests.test_conflict_diff
79
80
    import tests.test_link_tree
80
81
    import tests.test_patch
81
82
    import tests.test_rspush
96
97
    result.addTest(TestLoader().loadTestsFromModule(tests.test_patch))
97
98
    result.addTest(TestLoader().loadTestsFromModule(tests.test_rspush))
98
99
    result.addTest(TestLoader().loadTestsFromModule(tests.test_cbranch))
 
100
    result.addTest(TestLoader().loadTestsFromModule(tests.test_conflict_diff))
99
101
    return result