t / t5100 / msg0008on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1>Here is an empty patch from A U Thor.
   2
   3Hey you forgot the patch!
   4