t / t5100 / msg0001on commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1Here is a patch from A U Thor.
   2