mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 07:46:11 +02:00
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"
This commit is contained in:
Junio C Hamano 2011-10-13 19:03:24 -07:00
parent 3022386fee d30db5605b
commit b73c6834dd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge-one-file.sh
View File

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