Andrew's git / gitweb.git / t/t4034/tex/pre
?
t / t4034 / tex / preon commit rerere: teach rerere to handle nested conflicts (4af3220)
   1\section{Something}
   2\emph{Macro style}
   3{\em State toggle style}
   4\\[1em]