X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-one-file.sh;h=f612cb847aca981e16cb6006fa08d870497c6263;hb=afb6b561e3dad13df5d9df9731751a3d310c0854;hp=7aeb96952f668baef2fd18383806e13a20415f19;hpb=456a4c08b8d8ddefda939014c15877ace3e3f499;p=git.git

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 7aeb96952..f612cb847 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -117,7 +117,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 
 		# If we do not have enough common material, it is not
 		# worth trying two-file merge using common subsections.
-		expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
+		expr $sz0 \< $sz1 \* 2 >/dev/null || : >$orig
 		;;
 	*)
 		echo "Auto-merging $4"