t / t5100 / msg0006on commit Merge branch 'se/doc-checkout-ours-theirs' into maint (204ea3c)
   1Here is a patch from A U Thor.
   2