changeset 3592 | fffc8a733bf9 |
parent 3580 | 41989e55fa37 |
child 6350 | 6aa4a3fa4e60 |
--- a/tests/test-merge5 Sun Oct 29 13:08:10 2006 +0100 +++ b/tests/test-merge5 Tue Oct 31 13:02:49 2006 +0100 @@ -12,13 +12,9 @@ hg update 0 rm b hg commit -A -m"comment #2" -d "1000000 0" - -echo This is file a > a # in theory, we shouldn't need the "-y" below, but it prevents # this test from hanging when "hg update" erroneously prompts the # user for "keep or delete" -hg update -y 1 # should fail (unclean repo) -hg revert a hg update -y 1 exit 0