Merge branch 'fc/rerere-conflict-style' into maint
[git] / t / t5100 / msg0015
1   - a list
2   - of stuff