Merge branch 'js/maint-merge-one-file-osx-expr' into maint
commitc510259c02b46d5edb84568ee9eb0967b25bb75b
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:25 +0000 (21 10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:25 +0000 (21 10:49 -0700)
tree0d01a568df0b49c15bbf5dd4cadf566f5c221519
parentcec3e186f7b76cdced54286ef1da42b6978c4c8d
parentd30db5605b03a45b2848fa9131c3485dc93f7dad
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"
git-merge-one-file.sh