diff -r 1184bb274cb3 -r ffb5c09ba822 tests/test-rename-merge2.t --- a/tests/test-rename-merge2.t Mon Apr 18 20:52:08 2011 -0500 +++ b/tests/test-rename-merge2.t Tue Apr 19 12:04:44 2011 +0200 @@ -17,9 +17,8 @@ $ tm() > { - > mkdir t + > hg init t > cd t - > hg init > echo "[merge]" >> .hg/hgrc > echo "followcopies = 1" >> .hg/hgrc >