![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Dec 2011 19:42:45 +0000 (11:42 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Dec 2011 19:42:45 +0000 (11:42 -0800) | ||
| commit | 406cc9b822b44a1d53c1a45536460992529aec88 | |
| tree | 123a7975e84cd1d8fff6feaf2fd92355a4e23fb8 | tree | snapshot |
| parent | 3bb8d69cddbcad4bd4ae3d1281c42c1aeb297355 | commit | diff |
| parent | cc64b318f26c9e176c4f07b1a459a86e7a04c4eb | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |