X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=git-merge-octopus.sh;h=6c390d6c229d7ef8cca8ae01d33b42b57e29c3b3;hb=cc756edda63769cf6d7acc99e6ad3a9cbb5dc3ec;hp=bcf0d92ec223bf9e1f0995c5acef6376d1299502;hpb=f3d5bbb28322307592f9e5f5f21e69ff0249eea7;p=thirdparty%2Fgit.git

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index bcf0d92ec2..6c390d6c22 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -100,7 +100,7 @@ do
 	if test $? -ne 0
 	then
 		gettextln "Simple merge did not work, trying automatic merge."
-		git-merge-index -o git-merge-one-file -a ||
+		git merge-index -o git-merge-one-file -a ||
 		OCTOPUS_FAILURE=1
 		next=$(git write-tree 2>/dev/null)
 	fi