t / t5100 / msg0006on commit merge_recursive: Fix renames across paths below D/F conflicts (5a2580d)
   1Here is a patch from A U Thor.
   2