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

diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index 75e1de49a..bb19da2cc 100755
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -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