t / t5100 / msg0006on commit Merge branch 'jc/fix-diff-files-unmerged' into maint (a613b53)
   1Here is a patch from A U Thor.
   2