t / t5100 / msg0009on commit git-merge-recursive: learn to honor merge.conflictstyle (c236bcd)
   1This is to fix diff-format documentation.
   2