Code

Merge branch 'bc/maint-apply-check-no-patch' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:45 +0000 (11:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:45 +0000 (11:42 -0800)
* 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

1  2 
builtin/apply.c

diff --cc builtin/apply.c
Simple merge