tests/test-inotify-issue1371.out

commit: tidy up mergestate slightly

inserv1
% inserve
adding a
adding b
adding c
adding d
adding e
adding f
adding hg.pid
M c
A g
A h
R a
R e
! b
Are we able to kill the service? if not, the service died on some error