cherry-pick/revert: add scissors line on merge conflict
[git] / t / t5100 / msg0007
1 Here is an empty patch from A U Thor.
2