t / t5100 / msg0006on commit Merge branch 'jc/maint-add-u-remove-conflicted' (f39e4cf)
   1Here is a patch from A U Thor.
   2