t / t5100 / msg0006on commit git-merge-recursive: learn to honor merge.conflictstyle (c236bcd)
   1Here is a patch from A U Thor.
   2