diff -r 26c8d37496c2 -r 890e285c52a1 tests/test-merge-revert2 --- a/tests/test-merge-revert2 Sun Aug 20 02:21:59 2006 -0300 +++ b/tests/test-merge-revert2 Mon Aug 21 09:44:52 2006 -0700 @@ -16,7 +16,7 @@ hg id echo "changed file1" >> file1 hg id -hg revert --no-backup +hg revert --no-backup --all hg diff hg status hg id @@ -31,11 +31,11 @@ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/" hg status hg id -hg revert --no-backup +hg revert --no-backup --all hg diff hg status hg id -hg revert -r tip --no-backup +hg revert -r tip --no-backup --all hg diff hg status hg id