Viewing all changes in revision 4597.2.2.
- Committer: Vincent Ladeuil
- Date: 2009-08-13 14:34:56 UTC
- mto: (4597.11.1 537956-parent-loop-incomplete) (4929.1.1 integration) (5112.1.1 integration) (5113.1.1 integration) (5114.1.1 various) (5401.1.1 integration) (5067.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 4930.
- Revision ID: v.ladeuil+lp@free.fr-20090813143456-rnzl2lkja386f25w
Cleanup conflict tests.
* bzrlib/tests/test_conflicts.py:
Fix imports, reorder test for better locality of references
regarding test data.
* bzrlib/tests/test_conflicts.py:
Fix imports, reorder test for better locality of references
regarding test data.
- files modified:
- bzrlib/tests/test_conflicts.py
expand all
collapse all
added
removed
