cherry-pick/revert: add scissors line on merge conflict
[git] / t / t5100 / msg0017
1 New content here
2