changeset 6329 | 3f754be7abbb |
parent 6296 | a9e6b8875805 |
child 12156 | 4c94b6d0fb1c |
--- a/tests/test-filebranch Thu Mar 20 14:14:15 2008 -0500 +++ b/tests/test-filebranch Thu Mar 20 15:59:54 2008 -0500 @@ -37,7 +37,7 @@ hg commit -m "branch b" -d "1000000 0" echo "we shouldn't have anything but n state here" -hg debugstate --nodates +hg debugstate --nodates | grep -v "^n" echo merging hg pull ../a