git-merge: no reason to use cpio anymore