Merge branch 'rs/xdiff-hunk-with-func-line' into maint
[git] / t / t5100 / msg0016
1 and some content
2