From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Oct 2011 02:03:24 +0000 (-0700)
Subject: Merge branch 'js/maint-merge-one-file-osx-expr'
X-Git-Tag: v1.7.8-rc0~75
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b73c6834dd8796a9d6a8443dfd75368f5a91e5c2;p=git.git

Merge branch 'js/maint-merge-one-file-osx-expr'

* js/maint-merge-one-file-osx-expr:
  merge-one-file: fix "expr: non-numeric argument"
---

b73c6834dd8796a9d6a8443dfd75368f5a91e5c2