t / t5100 / msg0008on commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1>Here is an empty patch from A U Thor.
   2
   3Hey you forgot the patch!
   4