t / t5100 / msg0001on commit Remove uncontested renamed files during merge. (8371234)
   1Here is a patch from A U Thor.
   2