Code

Merge branch 'bc/maint-apply-check-no-patch'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:56:22 +0000 (22:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:56:22 +0000 (22:56 -0800)
commitb661a4bc1e172a9c67bf62bdc2715bd4efbc16e5
tree5104d722f0547044c3f129bc49f866aa7498d114
parent424f30a5ae3ff26fca14df71cce31b06d1dec919
parentcc64b318f26c9e176c4f07b1a459a86e7a04c4eb
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
builtin/apply.c