t / t4034 / tex / preon commit merge-recursive: avoid incorporating uncommitted changes in a merge (65170c0)
   1\section{Something}
   2\emph{Macro style}
   3{\em State toggle style}
   4\\[1em]