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