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