t / t5100 / msg0006on commit t3308: create a real ref directory/file conflict (f2515d9)
   1Here is a patch from A U Thor.
   2