Merge branch 'se/doc-checkout-ours-theirs' into maint
[git] / t / t5100 / msg0015
1   - a list
2   - of stuff