diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-14 02:03:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-14 02:03:24 (GMT) |
| commit | b73c6834dd8796a9d6a8443dfd75368f5a91e5c2 (patch) | |
| tree | 0ef01c7a9b12221bbe2783790bb07757341b9674 /git-merge-one-file.sh | |
| parent | 3022386fee01512c8a46bbad68fe32d4fabeba48 (diff) | |
| parent | d30db5605b03a45b2848fa9131c3485dc93f7dad (diff) | |
| download | git-b73c6834dd8796a9d6a8443dfd75368f5a91e5c2.zip git-b73c6834dd8796a9d6a8443dfd75368f5a91e5c2.tar.gz git-b73c6834dd8796a9d6a8443dfd75368f5a91e5c2.tar.bz2 | |
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-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 7aeb969..f612cb8 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" |