read-tree --reset: update working tree file for conflicted paths.