t / t5100 / msg0016on commit Merge branch 'fc/rerere-conflict-style' into maint (ada8710)
   1and some content
   2