RelNoteson commit t3308: create a real ref directory/file conflict (f2515d9)
   1Documentation/RelNotes/2.15.0.txt