git-resolve-script: stop when the automated merge fails