[PATCH] Really fix git-merge-one-file-script this time.