Code

Merge branch 'js/maint-merge-one-file-osx-expr' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:25 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:25 +0000 (10:49 -0700)
* js/maint-merge-one-file-osx-expr:
  merge-one-file: fix "expr: non-numeric argument"

1  2 
git-merge-one-file.sh

Simple merge