t / t5100 / msg0017on commit t3308: create a real ref directory/file conflict (f2515d9)
   1New content here
   2