changeset 2029 | d436b21b20dc |
parent 1933 | 7544700fd931 |
child 2965 | 890e285c52a1 |
--- a/tests/test-merge-revert2 +++ b/tests/test-merge-revert2 @@ -16,7 +16,7 @@ hg update -C 0 hg id echo "changed file1" >> file1 hg id -hg revert +hg revert --no-backup hg diff hg status hg id @@ -31,11 +31,11 @@ hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.- -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/" hg status hg id -hg revert +hg revert --no-backup hg diff hg status hg id -hg revert -r tip +hg revert -r tip --no-backup hg diff hg status hg id