t / t5100 / msg0009on commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1This is to fix diff-format documentation.
   2