git add: respect core.filemode with unmerged entries