t / t4034 / tex / preon commit Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax (ff65e79)
   1\section{Something}
   2\emph{Macro style}
   3{\em State toggle style}
   4\\[1em]