t / t5100 / patch0008on commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1