Merge branch 'bc/maint-apply-check-no-patch'

* 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 13, 2011 at 22:56 UTC b661a4bc1e172a9c67bf62bdc2715bd4efbc16e5

No changes.