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"
This commit is contained in:
Junio C Hamano 2011-10-21 10:49:25 -07:00
Родитель cec3e186f7 d30db5605b
Коммит c510259c02
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -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"