Skip to content
Browse files

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"
  • Loading branch information...
2 parents cec3e18 + d30db56 commit c510259c02b46d5edb84568ee9eb0967b25bb75b @gitster committed
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 c510259

Please sign in to comment.
Something went wrong with that request. Please try again.