Andrew's git / gitweb.git / t/t4034/tex/post
?
t / t4034 / tex / poston commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1\section{Something new}
   2\textbf{Macro style}
   3{\bfseries State toggle style}
   4\\[1cm]