X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-resolve.sh;h=c9da747fcfe504b1fd233c68d91e549def0f3571;hb=f350e1faaa7070030a5c40acdaec650b47dfdc12;hp=bb19da2cc15715df9c96ddea18c6d449ce49b6e4;hpb=941fd1c041204f30279c175ca9b7252ffcb52ba2;p=git.git

diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index bb19da2cc..c9da747fc 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 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