Merge branch 'jb/diff-no-index-no-abbrev'
[git] / t / t5100 / msg0016
1 and some content
2