t / t5100 / msg0007on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1Here is an empty patch from A U Thor.
   2