Code

Merge branch 'gb/maint-am-patch-format-error-message' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 21:11:18 +0000 (14:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 21:11:18 +0000 (14:11 -0700)
* gb/maint-am-patch-format-error-message:
  am: format is in $patch_format, not parse_patch

1  2 
git-am.sh

diff --cc git-am.sh
Simple merge