git-merge-file: refuse to merge binary files