Update git-merge-one-file-script.