From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Dec 2011 19:42:45 +0000 (-0800)
Subject: Merge branch 'bc/maint-apply-check-no-patch' into maint
X-Git-Tag: v1.7.8.1~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=406cc9b822b44a1d53c1a45536460992529aec88;p=git.git

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

406cc9b822b44a1d53c1a45536460992529aec88