t / t5100 / msg0015on commit Merge branch 'fc/rerere-conflict-style' into maint (ada8710)
   1  - a list
   2  - of stuff