RelNoteson commit git-merge-recursive: learn to honor merge.conflictstyle (c236bcd)
   1Documentation/RelNotes-1.6.0.1.txt