changeset 440 | 22b5aaeb3637 |
parent 414 | 291a62848f54 |
child 491 | 66eb9905d0a2 |
child 495 | e94cebc60d96 |
--- a/tests/test-flags Thu Jun 23 09:22:30 2005 -0800 +++ b/tests/test-flags Thu Jun 23 09:26:43 2005 -0800 @@ -13,7 +13,7 @@ cd test2 hg init -hg merge ../test1 +hg pull ../test1 hg co chmod +x a hg ci -t "chmod +x a" -u test -d "0 0" @@ -22,7 +22,7 @@ echo 123 >>a hg ci -t "a updated" -u test -d "0 0" -hg merge ../test2 +hg pull ../test2 hg heads hg history