Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
[git] / t / t5100 / msg0015
1   - a list
2   - of stuff