Merge branch 'gb/maint-am-patch-format-error-message' into maint
commit40ffc49876611150104102d59a35d865e4670bd7
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 21:11:18 +0000 (23 14:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 21:11:18 +0000 (23 14:11 -0700)
treee341ca0e53f3824c2ab8d8a2dd2ef6fe6a7330d3
parente622f41dcd97861796c7529712170f9eae07dc56
parentdff4b0ef30cd3f06e1f2383ce09f81b8da94d5b3
Merge branch 'gb/maint-am-patch-format-error-message' into maint

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