t / t5100 / msg0006on commit Merge branch 'jk/rebase-i-submodule-conflict-only' into maint (a4da338)
   1Here is a patch from A U Thor.
   2