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