tests/test-inotify-issue1542.out

commit: tidy up mergestate slightly

% inserve
A dir/c
? a
? dir/b
? hg.pid
% moving dir out
% status
! dir/c
? a
? hg.pid
Are we able to kill the service? if not, the service died on some error