t / t5100 / rfc2047-info-0004on commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1Author: Nathaniel Borenstein (םולש ןב ילטפנ)
   2Email: nsb@thumper.bellcore.com
   3Subject: Test of new header generator
   4