diff --git a/git-merge.sh b/git-merge.sh index ca7cb30d6c..1c123a37e6 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -38,24 +38,6 @@ use_strategies= allow_fast_forward=t allow_trivial_merge=t -# Fix some commands on Windows -case $(uname -s) in -*MINGW*) - # there's no cpio; emulate with tar - cpio () { - case "$*" in - "-0 -o") - tar --create --file=- --null --files-from=- - ;; - "-iuv") - tar xvf - - ;; - *) die "internal error: unexpected cpio $*";; - esac - } - ;; -esac - dropsave() { rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \ "$GIT_DIR/MERGE_STASH" || exit 1