t / t5100 / msg0006on commit read-cache: fix directory/file conflict handling in read_index_unmerged() (ad37620)
   1Here is a patch from A U Thor.
   2