t / t5100 / msg0009on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1This is to fix diff-format documentation.
   2