Change merge-cache and git-merge-one-file to use the SHA1 of the file