Merge branch 'dp/merge-strategy-doc-fix'
[git] / t / t5100 / msg0015