diff -r a3b5347c22cd -r 291a62848f54 tests/test-flags --- a/tests/test-flags Tue Jun 21 19:07:13 2005 -0800 +++ b/tests/test-flags Tue Jun 21 19:12:56 2005 -0800 @@ -22,8 +22,6 @@ echo 123 >>a hg ci -t "a updated" -u test -d "0 0" -ls -l ../test[12]/a - hg merge ../test2 hg heads hg history