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