From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Oct 2011 17:49:25 +0000 (-0700)
Subject: Merge branch 'js/maint-merge-one-file-osx-expr' into maint
X-Git-Tag: v1.7.7.1~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c510259c02b46d5edb84568ee9eb0967b25bb75b;p=git.git

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

c510259c02b46d5edb84568ee9eb0967b25bb75b