Fix git-resolve-script.