t / t5100 / msg0006on commit Merge branch 'jk/add-p-skip-conflicts' into maint (4579a05)
   1Here is a patch from A U Thor.
   2