Merge branch 'fc/rerere-conflict-style' into maint
[git] / t / t5100 / msg0016
1 and some content
2