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