t / t4100 / t-apply-2.expecton commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1 Makefile         |    2 +-
   2 git-fetch-script |    5 -----
   3 git-pull-script  |   34 +---------------------------------
   4 3 files changed, 2 insertions(+), 39 deletions(-)
   5 copy git-pull-script => git-fetch-script (87%)