Andrew's git / gitweb.git / t/t4034/tex/post
?
t / t4034 / tex / poston commit rerere: teach rerere to handle nested conflicts (4af3220)
   1\section{Something new}
   2\textbf{Macro style}
   3{\bfseries State toggle style}
   4\\[1cm]