RelNoteson commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1Documentation/RelNotes-1.6.0.1.txt