[PATCH] optimize git-resolve-script