t / t5100 / msg0001on commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1Here is a patch from A U Thor.
   2