Use backticks in git-merge-one-file-script instead of $(command).