Handle core.symlinks=false case in merge-recursive.