X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-resolve.sh;h=93bcfc2f5dce418d00f26257788932d5c738785c;hb=bb034f839a396cf0660024a59bbff61f8ef0c5af;hp=75e1de49ac9adb443e6065c93ac691c27f0f5518;hpb=3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7;p=git.git

diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index 75e1de49a..93bcfc2f5 100755
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -25,7 +25,7 @@ do
 	esac
 done
 
-# Give up if we are given more than two remotes -- not handling octopus.
+# Give up if we are given two or more remotes -- not handling octopus.
 case "$remotes" in
 ?*' '?*)
 	exit 2 ;;
@@ -37,10 +37,10 @@ then
 	exit 2
 fi
 
-git-update-index --refresh 2>/dev/null
-git-read-tree -u -m --aggressive $bases $head $remotes || exit 2
+git update-index --refresh 2>/dev/null
+git read-tree -u -m --aggressive $bases $head $remotes || exit 2
 echo "Trying simple merge."
-if result_tree=$(git-write-tree  2>/dev/null)
+if result_tree=$(git write-tree  2>/dev/null)
 then
 	exit 0
 else