git-merge: no reason to use cpio anymore
commita64d7784e830b3140e7d0f2b45cb3d8fafb84cca
authorJunio C Hamano <gitster@pobox.com>
Thu, 1 Nov 2007 21:30:30 +0000 (1 14:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Nov 2007 21:30:52 +0000 (1 14:30 -0700)
tree9e10928ef209844c8961fcf7116ff88cd414929c
parent0f49327c9755b6575b447f79b540749d231cb26d
git-merge: no reason to use cpio anymore

Now we have "git stash create", we can use it to safely stash
away the dirty state in the tree.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-merge.sh