Merge branch 'rd/diff-options-typofix'
[git] / t / t5100 / msg0015