t / t5100 / msg0009on commit Merge branch 'fc/rerere-conflict-style' into maint (ada8710)
   1This is to fix diff-format documentation.
   2