"git-merge-one-file.sh" did not exist on "98a96b00b88ee35866cd0b1e94697db76bd5ddf9"