t / t4034 / tex / poston commit t6036: tests for criss-cross merges with various directory/file conflicts (827f2b7)
   1\section{Something new}
   2\textbf{Macro style}
   3{\bfseries State toggle style}
   4\\[1cm]