t / t5100 / msg0001on commit merge-recursive: Fix D/F conflicts (3734893)
   1Here is a patch from A U Thor.
   2