Merge branch 'ef/mingw-write'

* ef/mingw-write:
  mingw: remove mingw_write
  prefer xwrite instead of write

diff --cc builtin/merge.c
Simple merge

diff --cc streaming.c
Simple merge

diff --cc transport-helper.c
Simple merge