Implement a test for git-fetch-pack/git-upload-pack

[git.git] / git-merge.sh

diff --git a/git-merge.sh b/git-merge.sh
index 3457a96..6ad96eb 100755 (executable)
--- 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"
 }