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