[PATCH] Fix git-merge-one-file permissions auto-merging