# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1166835910 28800
# Node ID f321d841dce5191737caf3608d0534dc68bba3d8
# Parent  a8eb050c6489e9e1cea3ad325bf210bdfccc8c6f# Parent  2b87d3c5ab8e2ac79479c643c30e3949ca64690e
Merge with mpm

diff -r 2b87d3c5ab8e -r f321d841dce5 tests/test-manifest-merging
--- a/tests/test-manifest-merging	Fri Dec 22 17:59:40 2006 -0600
+++ b/tests/test-manifest-merging	Fri Dec 22 17:05:10 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