tests/test-inotify-issue1208.out

merge: simplify flag merging code slightly

% fail
could not talk to new inotify server: No such file or directory
abort: could not start server: File exists
% inserve
% status
? hg.pid