diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index 75e1de49ac9adb443e6065c93ac691c27f0f5518..93bcfc2f5dce418d00f26257788932d5c738785c 100755 (executable)
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
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 ;;
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