git-resolve-script: don't wait for three seconds any more