tests/test-inotify-issue1208.out

resolve: move reset to localrepo.commit

This way rebase doesn't leave a stale resolve state

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