X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-resolve.sh;h=bb19da2cc15715df9c96ddea18c6d449ce49b6e4;hb=b798671fa935492ce511766bc99fb26b2892499b;hp=0a8ef216cb8a45df7f900a0c9698bec3e4bb47bb;hpb=0825de892f1796e6ca6ac81e0af10f6c136a9f1d;p=git.git

diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index 0a8ef216c..bb19da2cc 100755
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Linus Torvalds
 # Copyright (c) 2005 Junio C Hamano
 #
-# Resolve two trees, using enhancd multi-base read-tree.
+# Resolve two trees, using enhanced multi-base read-tree.
 
 # The first parameters up to -- are merge bases; the rest are heads.
 bases= head= remotes= sep_seen=
@@ -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