t / t4034 / tex / poston commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1\section{Something new}
   2\textbf{Macro style}
   3{\bfseries State toggle style}
   4\\[1cm]