t / t5100 / msg0008on commit git-merge-recursive: learn to honor merge.conflictstyle (c236bcd)
   1>Here is an empty patch from A U Thor.
   2
   3Hey you forgot the patch!
   4