Merge branch 'ph/rerere-doc' into maint

[git.git] / git-merge-resolve.sh

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