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