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"

diff --combined git-merge-one-file.sh
index 7aeb96952f668baef2fd18383806e13a20415f19,ae97e1dfa682a4a30e818cccadf5d9ed8aa2ecfb..f612cb847aca981e16cb6006fa08d870497c6263
--- 1/git-merge-one-file.sh
--- 2/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@@ -22,11 -22,6 +22,11 @@@ LONG_USAGE="Usage: git merge-one-file $
  
  Blob ids and modes should be empty for missing files."
  
 +SUBDIRECTORY_OK=Yes
 +. git-sh-setup
 +cd_to_toplevel
 +require_work_tree
 +
  if ! test "$#" -eq 7
  then
        echo "$LONG_USAGE"
@@@ -112,12 -107,12 +112,12 @@@ case "${1:-.}${2:-.}${3:-.}" i
                # remove lines that are unique to ours.
                orig=`git-unpack-file $2`
                sz0=`wc -c <"$orig"`
 -              diff -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add
 +              @@DIFF@@ -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add
                sz1=`wc -c <"$orig"`
  
                # 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"
@@@ -137,7 -132,7 +137,7 @@@
  
        # Create the working tree file, using "our tree" version from the
        # index, and then store the result of the merge.
 -      git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4"
 +      git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4" || exit 1
        rm -f -- "$orig" "$src1" "$src2"
  
        if [ "$6" != "$7" ]; then