diff -r bace1990ab12 -r a9e6b8875805 tests/test-filebranch --- a/tests/test-filebranch Mon Mar 17 23:36:45 2008 +0100 +++ b/tests/test-filebranch Tue Mar 18 04:07:39 2008 -0300 @@ -37,7 +37,7 @@ hg commit -m "branch b" -d "1000000 0" echo "we shouldn't have anything but n state here" -hg debugstate | cut -b 1-16,37- +hg debugstate --nodates echo merging hg pull ../a @@ -48,7 +48,7 @@ echo new > quux echo "we shouldn't have anything but foo in merge state here" -hg debugstate | cut -b 1-16,37- | grep "^m" +hg debugstate --nodates | grep "^m" hg ci -m "merge" -d "1000000 0"