t / t5100 / msg0015on commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1  - a list
   2  - of stuff