t / t5100 / msg0006on commit Merge branch 'wd/rebase-conflict-guide' (076eeec)
   1Here is a patch from A U Thor.
   2