t / t5100 / msg0009on commit Merge branch 'se/doc-checkout-ours-theirs' into maint (204ea3c)
   1This is to fix diff-format documentation.
   2