t / t5100 / patch0007on commit git-merge-recursive: learn to honor merge.conflictstyle (c236bcd)
   1