# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1166995681 -3600
# Node ID c137e21dba5a463d059c32e2aaca086969b82da8
# Parent  f321d841dce5191737caf3608d0534dc68bba3d8
test-manifest-merging: we only need to remove files

diff -r f321d841dce5 -r c137e21dba5a tests/test-manifest-merging
--- a/tests/test-manifest-merging	Fri Dec 22 17:05:10 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