--- a/tests/test-merge3 Fri May 14 12:57:24 2010 -0500 +++ b/tests/test-merge3 Sat May 15 17:48:49 2010 -0500 @@ -8,3 +8,4 @@ hg add b rm b hg commit -A -m"comment #1" -d "1000000 0" +exit 0