Merge branch 'gb/maint-am-patch-format-error-message'

* gb/maint-am-patch-format-error-message: am: format is in $patch_format, not parse_patch Conflicts: git-am.sh

Junio C Hamano committed Sep 2, 2011 at 13:18 UTC e7734c6c9b04d78e970b8de4765cdebd984ec6e6

No changes.