t / t5100 / msg0006on commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1Here is a patch from A U Thor.
   2