Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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...
commit b73c6834dd8796a9d6a8443dfd75368f5a91e5c2 2 parents 3022386 + d30db56
Junio C Hamano authored

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

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

0 comments on commit b73c683

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