read-tree -u one-way merge fix to check out locally modified paths.