Merge branch 'bc/maint-apply-check-no-patch' into maint
commit406cc9b822b44a1d53c1a45536460992529aec88
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:45 +0000 (21 11:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:45 +0000 (21 11:42 -0800)
tree123a7975e84cd1d8fff6feaf2fd92355a4e23fb8
parent3bb8d69cddbcad4bd4ae3d1281c42c1aeb297355
parentcc64b318f26c9e176c4f07b1a459a86e7a04c4eb
Merge branch 'bc/maint-apply-check-no-patch' into maint

* bc/maint-apply-check-no-patch:
  builtin/apply.c: report error on failure to recognize input
  t/t4131-apply-fake-ancestor.sh: fix broken test
builtin/apply.c