make test-confused-revert check working dir with two parents.
--- a/tests/test-confused-revert
+++ b/tests/test-confused-revert
@@ -41,9 +41,12 @@ hg remove a
echo "%%% should show a removed and b added"
hg status
-echo "reverting..."
+echo "%%% revert should fail"
hg revert
+echo "%%% revert should be ok now"
+hg revert -r2
+
echo "%%% should show b unknown and a marked modified (merged)"
hg status
--- a/tests/test-confused-revert.out
+++ b/tests/test-confused-revert.out
@@ -16,7 +16,9 @@ foo-b
%%% should show a removed and b added
A b
R a
-reverting...
+%%% revert should fail
+abort: working dir has two parents; you must specify the revision to revert to
+%%% revert should be ok now
undeleting a
forgetting b
%%% should show b unknown and a marked modified (merged)