t / t4034 / tex / preon commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1\section{Something}
   2\emph{Macro style}
   3{\em State toggle style}
   4\\[1em]