t / t5100 / msg0006on commit merge-recursive: Fix multiple file rename across D/F conflict (ae74548)
   1Here is a patch from A U Thor.
   2