t / t5100 / msg0006on commit octopus: make merge process simpler to follow (8133450)
   1Here is a patch from A U Thor.
   2