t / t5100 / msg0006on commit merge-recursive: fix remaining directory rename + dirty overwrite cases (18797a3)
   1Here is a patch from A U Thor.
   2