RelNoteson commit merge: detect delete/modechange conflict (72fac66)
   1Documentation/RelNotes/2.2.3.txt