From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Oct 2011 17:49:25 +0000 (-0700)
Subject: Merge branch 'js/maint-merge-one-file-osx-expr' into maint
X-Git-Tag: v1.7.7.1~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c510259c02b46d5edb84568ee9eb0967b25bb75b?hp=cec3e186f7b76cdced54286ef1da42b6978c4c8d

Merge branch 'js/maint-merge-one-file-osx-expr' into maint

* js/maint-merge-one-file-osx-expr:
merge-one-file: fix "expr: non-numeric argument"
---

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 7aeb96952f..f612cb847a 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"