--- a/tests/test-merge7 Mon Sep 26 16:52:47 2005 -0700
+++ b/tests/test-merge7 Tue Sep 27 14:53:11 2005 -0700
@@ -34,7 +34,7 @@
hg commit -m "2 -> 2.5" -d "0 0"
# now pull and merge from test-a
-hg pull
+hg pull ../test-a
HGMERGE=merge hg update -m
# resolve conflict
cat >test.txt <<"EOF"
@@ -52,14 +52,14 @@
two-point-one
three
EOF
-hg commit -m "two -> two-point-one"
+hg commit -m "two -> two-point-one" -d "0 0"
# pull and merge from test-a again
cd ../test-b
-hg pull
+hg pull ../test-a
HGMERGE=merge hg update --debug -m
-cat test.txt
+cat test.txt | sed "s% .*%%"
hg debugindex .hg/data/test.txt.i