diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:25 -0700 |
| commit | c510259c02b46d5edb84568ee9eb0967b25bb75b (patch) | |
| tree | 0d01a568df0b49c15bbf5dd4cadf566f5c221519 | |
| parent | cec3e186f7b76cdced54286ef1da42b6978c4c8d (diff) | |
| parent | d30db5605b03a45b2848fa9131c3485dc93f7dad (diff) | |
| download | git-c510259c02b46d5edb84568ee9eb0967b25bb75b.tar.gz | |
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"
| -rwxr-xr-x | git-merge-one-file.sh | 2 |
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" |