t / t5100 / msg0008on commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1>Here is an empty patch from A U Thor.
   2
   3Hey you forgot the patch!
   4