RelNoteson commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1Documentation/RelNotes/1.7.9.6.txt