cherry-pick/revert: add scissors line on merge conflict
[git] / t / t5100 / msg0016
1 and some content
2