t / t5100 / msg0015on commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1