t / t5100 / msg0016on commit t7405: add a directory/submodule conflict (e81c7d4)
   1and some content
   2