Code

Merge branch 'js/maint-merge-one-file-osx-expr'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:24 +0000 (19:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:24 +0000 (19:03 -0700)
commitb73c6834dd8796a9d6a8443dfd75368f5a91e5c2
tree0ef01c7a9b12221bbe2783790bb07757341b9674
parent3022386fee01512c8a46bbad68fe32d4fabeba48
parentd30db5605b03a45b2848fa9131c3485dc93f7dad
Merge branch 'js/maint-merge-one-file-osx-expr'

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