t / t4034 / tex / poston commit Merge branch 'nd/remote-plural-ours-plus-theirs' (7a7d085)
   1\section{Something new}
   2\textbf{Macro style}
   3{\bfseries State toggle style}
   4\\[1cm]