--- a/tests/test-merge-tools Thu Sep 02 22:17:22 2010 +0200
+++ b/tests/test-merge-tools Thu Sep 02 23:22:51 2010 +0200
@@ -9,23 +9,23 @@
echo "# revision 0"
echo "revision 0" > f
echo "space" >> f
-hg commit -Am "revision 0" -d "1000000 0"
+hg commit -Am "revision 0"
echo "# revision 1"
echo "revision 1" > f
echo "space" >> f
-hg commit -Am "revision 1" -d "1000000 0"
+hg commit -Am "revision 1"
hg update 0 > /dev/null
echo "# revision 2"
echo "revision 2" > f
echo "space" >> f
-hg commit -Am "revision 2" -d "1000000 0"
+hg commit -Am "revision 2"
hg update 0 > /dev/null
echo "# revision 3 - simple to merge"
echo "revision 3" >> f
-hg commit -Am "revision 3" -d "1000000 0"
+hg commit -Am "revision 3"
echo "[merge-tools]" > .hg/hgrc