--- a/tests/test-manifest-merging Fri Dec 22 16:29:35 2006 -0800
+++ b/tests/test-manifest-merging Sun Dec 24 22:28:01 2006 +0100
@@ -30,5 +30,5 @@
hg merge
echo % revert to changeset 1 to simulate a failed merge
-rm -fr alpha beta gamma
+rm -f alpha beta gamma
hg up -C 1