tests/test-rebuildstate.out

Use skipped: instead of hghave: for skipping tests, use this in test-merge-types

adding bar
adding foo
% state dump
a   0         -1 baz
n 644          0 foo
r   0          0 bar
% status
A baz
R bar
C foo
% state dump
n 666         -1 bar
n 666         -1 foo
% status
! bar
? baz
C foo