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

Junio C Hamano committed Dec 21, 2011 at 11:42 UTC 406cc9b822b44a1d53c1a45536460992529aec88

No changes.