RelNoteson commit ll_merge(): add ancestor label parameter for diff3-style output (f01de62)
   1Documentation/RelNotes-1.7.1.txt