t / t5100 / msg0001on commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1Here is a patch from A U Thor.
   2