t / t5100 / msg0001on commit merge-recursive: check for directory level conflicts (53e32d4)
   1Here is a patch from A U Thor.
   2