-
Committer:
Vincent Ladeuil
-
Date:
2009-12-24 18:20:28 UTC
-
mto:
(4597.3.53 description)
-
mto:
This revision was merged to the branch mainline in
revision
5009.
-
Revision ID:
v.ladeuil+lp@free.fr-20091224182028-6i2da0srkns1gd03
Cleanup blackbox conflict tests.
* bzrlib/tests/blackbox/test_conflicts.py:
Fix imports, get rid of os calls (including os.chdir).