X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-merge-one-file-script;h=3e128c665da501f9b07d3b2a932110394f2f169f;hb=de809dbbce497e0d107562615c1d85ff35b4e0c5;hp=3fb43ccb094dd398a753bf264f8532ec380f9087;hpb=54c26fb9d0cdff94c7717125d0a222b324bfea8a;p=git.git

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index 3fb43ccb..3e128c66 100755
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -52,9 +52,9 @@ case "${1:-.}${2:-.}${3:-.}" in
 #
 "$1$2$3")
 	echo "Auto-merging $4."
-	orig=$(git-unpack-file $1)
-	src1=$(git-unpack-file $2)
-	src2=$(git-unpack-file $3)
+	orig=`git-unpack-file $1`
+	src1=`git-unpack-file $2`
+	src2=`git-unpack-file $3`
 	merge "$src2" "$orig" "$src1"
 	ret=$?
 	if [ "$6" != "$7" ]; then
@@ -64,7 +64,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 		echo "ERROR: Leaving conflict merge in $src2."
 		exit 1
 	fi
-	sha1=$(git-write-blob "$src2") || {
+	sha1=`git-write-blob "$src2"` || {
 		echo "ERROR: Leaving conflict merge in $src2."
 	}
 	exec git-update-cache --add --cacheinfo "$6" $sha1 "$4" ;;