From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Dec 2011 06:56:22 +0000 (-0800)
Subject: Merge branch 'bc/maint-apply-check-no-patch'
X-Git-Tag: v1.7.9-rc0~67
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b661a4bc1e172a9c67bf62bdc2715bd4efbc16e5;p=git.git

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
---

b661a4bc1e172a9c67bf62bdc2715bd4efbc16e5