Code

Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 19 Apr 2008 05:07:00 +0000 (22:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 19 Apr 2008 05:07:00 +0000 (22:07 -0700)
* maint-1.5.4:
  am: POSIX portability fix

1  2 
git-am.sh

diff --cc git-am.sh
Simple merge