Permalink
Browse files

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

* js/maint-merge-one-file-osx-expr:
  merge-one-file: fix "expr: non-numeric argument"
  • Loading branch information...
2 parents 3022386 + d30db56 commit b73c6834dd8796a9d6a8443dfd75368f5a91e5c2 @gitster committed Oct 14, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 git-merge-one-file.sh
View
2 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"

0 comments on commit b73c683

Please sign in to comment.