RelNoteson commit ll-merge: use a longer conflict marker for internal merge (d694a17)
   1Documentation/RelNotes/2.3.8.txt