summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-13 19:03:24 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-13 19:03:24 -0700
commitb73c6834dd8796a9d6a8443dfd75368f5a91e5c2 (patch)
tree0ef01c7a9b12221bbe2783790bb07757341b9674 /git-merge-one-file.sh
parent3022386fee01512c8a46bbad68fe32d4fabeba48 (diff)
parentd30db5605b03a45b2848fa9131c3485dc93f7dad (diff)
downloadgit-b73c6834dd8796a9d6a8443dfd75368f5a91e5c2.tar.gz
Merge branch 'js/maint-merge-one-file-osx-expr'
* js/maint-merge-one-file-osx-expr: merge-one-file: fix "expr: non-numeric argument"
Diffstat (limited to 'git-merge-one-file.sh')
-rwxr-xr-xgit-merge-one-file.sh2
1 files changed, 1 insertions, 1 deletions
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"