Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
[git] / t / t5100 / msg0011
1 Here comes a commit log message, and
2 its second line is here.