Merge branch 'jk/diff-submodule-diff-inline'
[git] / t / t5100 / msg0015