Test 'git add' for unmerged entries when core.symlinks=false.