diff -r 07ee46a2ece3 -r afe0d4c24866 tests/test-confused-revert.t --- a/tests/test-confused-revert.t Tue Jun 07 14:18:39 2011 -0500 +++ b/tests/test-confused-revert.t Tue Jun 07 14:19:05 2011 -0500 @@ -59,7 +59,8 @@ Revert should fail: $ hg revert - abort: uncommitted merge - use "hg update", see "hg help revert" + abort: no files or directories specified + (use --all to revert all files) [255] Revert should be ok now: