X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=6ad96ebfbb06697a0ad0875274022d9103b24d0a;hb=1f5881bb5f4da97d0bb23024ae91079137326c7e;hp=3457a96cfd7a27ae4dffcf5d3f1ff2f9568bd83d;hpb=8ac3a61f59173d4a9a328518be83a25df610a5ef;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 3457a96c..6ad96ebf 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -25,7 +25,7 @@ dropsave() {
 
 savestate() {
 	# Stash away any local modifications.
-	git-diff-index -r -z --name-only $head |
+	git-diff-index -z --name-only $head |
 	cpio -0 -o >"$GIT_DIR/MERGE_SAVE"
 }