Revert "Implement a cpio emulation in git-merge.sh for Windows."
commitaca4f38d924e0e82f9870babe73c8ada63aadae3
authorJohannes Sixt <johannes.sixt@telecom.at>
Thu, 7 Feb 2008 20:23:32 +0000 (7 21:23 +0100)
committerJohannes Sixt <johannes.sixt@telecom.at>
Thu, 7 Feb 2008 20:23:32 +0000 (7 21:23 +0100)
tree4909c887ac0621543906c26de9c9164b1ec4e79a
parentac21c2bbb1f3787a6d2eb44c19a81d3e5b39bb67
Revert "Implement a cpio emulation in git-merge.sh for Windows."

This reverts commit 8b9de093190e6b1d6066efaf4afd9dc988096987.
git-merge does not use cpio anymore.
git-merge.sh