t / t5100 / patch0008on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1