commit | 406cc9b822b44a1d53c1a45536460992529aec88 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Wed Dec 21 11:42:45 2011 -0800 |
committer | Junio C Hamano <gitster@pobox.com> | Wed Dec 21 11:42:45 2011 -0800 |
tree | 123a7975e84cd1d8fff6feaf2fd92355a4e23fb8 | |
parent | 3bb8d69cddbcad4bd4ae3d1281c42c1aeb297355 [diff] | |
parent | cc64b318f26c9e176c4f07b1a459a86e7a04c4eb [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