t / t4100 / t-apply-6.expecton commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1 Makefile         |    2 +-
   2 git-fetch-script |   41 +++++++++++++++++++++++++++++++++++++++++
   3 git-pull-script  |   34 +---------------------------------
   4 3 files changed, 43 insertions(+), 34 deletions(-)
   5 create git-fetch-script