t / t4034 / tex / preon commit mergetool: honor diff.orderFile (57937f7)
   1\section{Something}
   2\emph{Macro style}
   3{\em State toggle style}
   4\\[1em]