--- a/tests/test-conflict Sat Jul 02 20:51:33 2005 -0800
+++ b/tests/test-conflict Sat Jul 02 22:54:35 2005 -0800
@@ -11,7 +11,7 @@
echo "something else" > a
hg commit -t branch2 -u test -d "0 0"
export HGMERGE=merge
-hg -d up -m 1
+hg up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status