t / t4034 / tex / preon commit Merge branch 'fc/rerere-conflict-style' into maint (ada8710)
   1\section{Something}
   2\emph{Macro style}
   3{\em State toggle style}
   4\\[1em]