Merge branch 'en/merge-path-collision'
[git] / t / chainlint / blank-line.expect
1 (
2         nothing &&
3         something
4 >)