t / t5100 / msg0001on commit Merge branch 'jc/fix-diff-files-unmerged' (22dbeee)
   1Here is a patch from A U Thor.
   2