From: Junio C Hamano Date: Fri, 23 Sep 2011 21:11:18 +0000 (-0700) Subject: Merge branch 'gb/maint-am-patch-format-error-message' into maint X-Git-Tag: v1.7.6.4~7 X-Git-Url: http://git.tremily.us/?p=git.git;a=commitdiff_plain;h=40ffc49876611150104102d59a35d865e4670bd7 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 --- 40ffc49876611150104102d59a35d865e4670bd7