t / t4034 / tex / preon commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1\section{Something}
   2\emph{Macro style}
   3{\em State toggle style}
   4\\[1em]