cherry-pick/revert: add scissors line on merge conflict
[git] / t / chainlint / comment.expect
1 (
2         nothing &&
3         something
4 >)